#99473# change string resource files

95 files changed, 955 insertions, 805 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 0753a53ef62a..c0defe64ae54 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescControl.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-26 10:17:39 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:41:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,9 +93,13 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
+#endif
+
 #ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
 #endif
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 3c3723e39ea3..d476905cf630 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationControl.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-02 06:51:46 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,8 +95,8 @@
 #ifndef DBAUI_RELCONTROLIFACE_HXX
 #include "RelControliFace.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index d203ef238463..756ef99d7fbe 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableGrantCtrl.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-09 07:44:13 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 #ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index ce8ea6cf0e14..21b1f50a0c20 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableGrantCtrl.src,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-13 20:43:47 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:42:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 
 String STR_TABLE_PRIV_NAME
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 008361e3a038..977ab814d860 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: marktree.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 07:37:42 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 #ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
@@ -358,6 +358,9 @@ SvLBoxEntry* OMarkableTreeListBox::GetEntryPosByName(const String& aName,SvLBoxE
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.8  2002/07/22 07:37:42  oj
+ *  #101514# remove resource entries for PLUS and MINUS
+ *
  *  Revision 1.7  2002/05/24 09:54:45  gt
  *  #99251# use of default images from SvLBoxButtonData
  *
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 46c5bb395e2f..9c1b184fe0b6 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:49:26 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 #ifndef _SV_MENU_HXX
 #include <vcl/menu.hxx>
@@ -641,6 +641,9 @@ void OTableTreeListBox::removedTable( const Reference< XConnection >& _rxConn, c
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.20  2002/04/29 08:49:26  oj
+ *  #98772# hi contrast changes
+ *
  *  Revision 1.19  2001/08/28 08:21:51  fs
  *  #91573# UpdateTableList returns the driver used for connecting
  *
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index 8665955f3d80..d94a5f41846c 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabletree.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-03 20:12:07 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:42:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 #ifndef _DBAUI_TABLETREE_HRC_
 #include "tabletree.hrc"
@@ -379,6 +379,9 @@ String STR_ALL_TABLES_AND_VIEWS
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.26  2002/08/03 20:12:07  kz
+ *  Merge SRX643: 03.08.02 - 22:08:55
+ *
  *  Revision 1.25  2002/05/02 22:44:43  kz
  *  Merge SRX642: 03.05.02 - 00:44:08
  *
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index 4c106a5834ef..97b91a324868 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undosqledit.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: vg $ $Date: 2001-11-16 22:31:55 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:42:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 
 String STR_QUERY_UNDO_MODIFYSQLEDIT
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx
index a80585451186..538f4f15f270 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AdabasStat.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-09 07:07:20 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:43:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,8 +85,8 @@
 #ifndef DBAUI_ADABASSTAT_HRC
 #include "AdabasStat.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index f8120e8a46fc..2dd670454511 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AdabasStat.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:25:32 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_ADABASSTAT_HRC
 #include "AdabasStat.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 #define WINDOW_SIZE_X 260
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index f98806659501..1a962afeb1ac 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationDlg.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 08:43:11 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:43:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,8 @@
 #ifndef _SV_SVAPP_HXX //autogen
 #include <vcl/svapp.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 7d56d49178de..e59603e38c6d 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -1,6 +1,6 @@
  //--------------------------------------------------------------------------
  //
- // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.26 2002-06-10 15:12:10 vg Exp $
+ // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.27 2002-08-19 07:47:19 oj Exp $
  //
  // (c) Copyright 1997 by Star Division GmbH, Hamburg.
  //
@@ -8,14 +8,14 @@
  //  AWO
  //
  // Letzte Aenderung:
- //  $Author: vg $ $Date: 2002-06-10 15:12:10 $ $Revision: 1.26 $
+ //  $Author: oj $ $Date: 2002-08-19 07:47:19 $ $Revision: 1.27 $
  //
  //--------------------------------------------------------------------------
 #ifndef DBAUI_RELATIONDIALOG_HRC
 #include "RelationDlg.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #include "dbaccess_helpid.hrc"
 
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index faf33f0ab89f..7d5b41679d36 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UserAdmin.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-23 13:39:41 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:43:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 6b596daec642..0fd4fe091b1c 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UserAdmin.src,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:26:53 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_USERADMIN_HRC
 #include "UserAdmin.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index ad4b114c16ab..dde4898cb42a 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adminpages.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-15 08:49:16 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:43:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXSTRITEM_HXX
 #include <svtools/stritem.hxx>
@@ -305,6 +305,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.31  2001/08/15 08:49:16  fs
+ *  #89822# added functionality to accelerate toolbox functions with key codes
+ *
  *  Revision 1.30  2001/05/23 13:47:00  fs
  *  #86444# +prepareConnectionAction
  *
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 37480fe4d7fe..1eec8b8205f0 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adtabdlg.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-18 08:56:25 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:43:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #include <tools/debug.hxx>
 #endif
 #include "dbaccess_helpid.hrc"
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index 284cb480de16..77c9b3cd6f82 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adtabdlg.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:35:48 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #include "adtabdlg.hrc"
 #endif
 #include "dbaccess_helpid.hrc"
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 ModelessDialog DLG_JOIN_TABADD
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 28a5a399cdd8..307369170ea0 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.80 $
+ *  $Revision: 1.81 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 07:01:22 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_DBADMIN_HRC_
 #include "dbadmin.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
@@ -2150,6 +2150,9 @@ IMPL_LINK(ODbAdminDialog, OnApplyChanges, PushButton*, EMPTYARG)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.80  2002/07/25 07:01:22  oj
+ *  #95146# new SfxItems for autoinc
+ *
  *  Revision 1.79  2002/07/09 12:43:20  oj
  *  #99921# check if datasource allows to check names
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index e9e821c71312..7207f7aeb008 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.106 $
+ *  $Revision: 1.107 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-15 20:10:05 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,8 +63,8 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_DBADMIN_HRC_
 #include "dbadmin.hrc"
@@ -3951,6 +3951,9 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.106  2002/08/15 20:10:05  kz
+ *  Merge SRX643: 15.08.02 - 22:06:52
+ *
  *  Revision 1.105  2002/08/05 20:53:20  kz
  *  Merge SRX643: 05.08.02 - 22:49:45
  *
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 96100f833c12..743176b9de7b 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 14:27:24 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,8 +73,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_DBF_INDEXES_HRC_
 #include "dbfindex.hrc"
@@ -605,6 +605,9 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.12  2002/04/29 14:27:24  oj
+ *  #98772# new images
+ *
  *  Revision 1.11  2001/07/17 07:30:50  oj
  *  #89533# GetMainURL changed
  *
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index ed78f72b4de8..aa6c993bbbb9 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-13 12:49:00 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_DBF_INDEXES_HRC_
 #include "dbfindex.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 #define WIN_X   264
@@ -392,6 +392,9 @@ ModalDialog DLG_DBASE_INDEXES
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.21  2002/06/13 12:49:00  kz
+ *  Merge SRX642: 13.06.02 - 14:48:31
+ *
  *  Revision 1.20  2002/05/02 23:18:40  kz
  *  Merge SRX642: 03.05.02 - 01:17:30
  *
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 46c45562dab9..247f23ea570f 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-26 09:33:29 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_DBADMIN_HRC_
 #include "dbadmin.hrc"
@@ -1345,6 +1345,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.15  2002/07/26 09:33:29  oj
+ *  #95146# new controls inserted for auto retrieving
+ *
  *  Revision 1.14  2002/07/09 12:39:05  oj
  *  #99921# check if datasource allows to check names
  *
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 06117477b9f8..9837424d5a6d 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: directsql.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-19 10:54:06 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
@@ -411,6 +411,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2001/06/19 10:54:06  fs
+ *  initial checkin - dialog for executing SQL statements
+ *
  *
  *  Revision 1.0 18.06.01 17:00:59  fs
  ************************************************************************/
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index a05ab367b335..0af3db44f203 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: directsql.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:42:48 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBACCESS_UI_DIRECTSQL_HRC_
 #include "directsql.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 #define BUTTON_SIZE_X       50
@@ -359,6 +359,9 @@ String STR_DIRECTSQL_CONNECTIONLOST
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.11  2001/11/16 22:42:48  kz
+ *  Merge SRC638: 16.11.01 - 22:41:18
+ *
  *  Revision 1.10  2001/09/26 20:28:03  kz
  *  Merge SRC638: 09/26/01 - 22:27:14
  *
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 718519b562d2..82fd9d63cc83 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgattr.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dr $ $Date: 2001-06-15 12:09:03 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,8 +102,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX
 #include <svtools/itemset.hxx>
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index fe85d942d63b..c198b9dcb696 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgattr.src,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:45:02 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef DBAUI_SBATTRDLG_HRC
 #include "dlgattr.hrc"
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 36240ff5beb0..40be22387e57 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 06:53:29 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index c58d1dd89933..5083a411b047 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:29:50 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_DLGSAVE_HRC
 #include "dlgsave.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 1041b8169b3e..938c450c509a 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsize.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 12:45:08 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index 52e6aa4a3022..a6e78387533e 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsize.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:49:32 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,7 @@
  // JN
  //
  // Letzte Aenderung:
- // $Author: kz $ $Date: 2001-11-16 22:49:32 $ $Revision: 1.18 $
+ // $Author: oj $ $Date: 2002-08-19 07:47:22 $ $Revision: 1.19 $
  //
  //---------------------------------------------------------------------------
 
@@ -76,8 +76,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 ModalDialog DLG_ROWHEIGHT
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index f9e5b141ac1f..d16150e1766c 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsselect.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-18 06:50:39 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
@@ -216,6 +216,9 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.3  2001/10/18 06:50:39  oj
+ *  #93260# reload odbc datasources
+ *
  *  Revision 1.2  2000/10/26 13:11:36  obo
  *  #65293# cant compile for linux
  *
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 8f342683adbf..04abb42a5153 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsselect.src,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:58:45 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_DSSELECT_HRC_
 #include "dsselect.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 
@@ -241,6 +241,9 @@ ModalDialog DLG_DATASOURCE_SELECTION
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.29  2001/11/16 22:58:45  kz
+ *  Merge SRC638: 16.11.01 - 22:57:12
+ *
  *  Revision 1.28  2001/11/07 09:59:14  kz
  *  Merge SRC638: 07.11.01 - 10:59:20
  *
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 60641cbd7e9e..127afeb65266 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generalpage.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-26 16:14:39 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_DBADMIN_HRC_
 #include "dbadmin.hrc"
@@ -455,13 +455,30 @@ namespace dbaui
     void OGeneralPage::checkCreateDatabase(DATASOURCE_TYPE _eType)
     {
         static BOOL bServiceFound = FALSE;
+        BOOL bInstallationFound = FALSE;
         OSL_ENSURE(m_pAdminDialog,"No parent set!");
-        if(_eType == DST_ADABAS && m_pAdminDialog && !bServiceFound)
+        if ( _eType == DST_ADABAS && m_pAdminDialog && !bServiceFound )
         {
             Reference<XCreateCatalog> xCatalog(m_xORB->createInstance(SERVICE_EXTENDED_ADABAS_DRIVER),UNO_QUERY);
             bServiceFound = xCatalog.is();
         }
+
         m_aCreateDatabase.Show(_eType == DST_ADABAS && bServiceFound);
+
+        if ( bServiceFound )
+        {
+            static const ::rtl::OUString sDBWORK(RTL_CONSTASCII_USTRINGPARAM("DBWORK"));
+            static const ::rtl::OUString sDBROOT(RTL_CONSTASCII_USTRINGPARAM("DBROOT"));
+            static const ::rtl::OUString sDBCONFIG(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG"));
+            rtl_uString* pDbVar = NULL;
+            if ( (osl_getEnvironment(sDBWORK.pData,&pDbVar) == osl_Process_E_None && pDbVar)
+                && ((pDbVar = NULL) == NULL && osl_getEnvironment(sDBROOT.pData,&pDbVar) == osl_Process_E_None && pDbVar)
+                && ((pDbVar = NULL) == NULL && osl_getEnvironment(sDBCONFIG.pData,&pDbVar) == osl_Process_E_None && pDbVar)
+                )
+                bInstallationFound = TRUE;
+
+            m_aCreateDatabase.Enable( bInstallationFound );
+        }
     }
 
     //-------------------------------------------------------------------------
@@ -1400,6 +1417,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.27  2001/10/26 16:14:39  hr
+ *  #92924#: gcc-3.0.1 needs lvalue
+ *
  *  Revision 1.26  2001/09/11 07:07:26  fs
  *  #92027# accept arbitrary valid URLs - not only file URLs - when browsing for a dBase or text directory
  *
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index ec285556b7e7..caf4a2ae3212 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexdialog.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 09:45:49 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_INDEXDIALOG_HXX_
 #include "indexdialog.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
@@ -983,6 +983,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.14  2002/07/30 09:45:49  oj
+ *  #101836# enable sql92 namechecking when needed!
+ *
  *  Revision 1.13  2002/04/29 08:27:33  oj
  *  #98772# impl toolbox hi contrast
  *
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 9faf9758755a..7cde428721d7 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexdialog.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-13 12:45:22 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_INDEXDIALOG_HRC_
 #include "indexdialog.hrc"
@@ -852,6 +852,9 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.26  2002/06/13 12:45:22  kz
+ *  Merge SRX642: 13.06.02 - 14:44:51
+ *
  *  Revision 1.25  2002/05/28 13:33:12  oj
  *  #99607# set maskcolor to magenta
  *
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index f2b7c4891a03..e4faaddf30dd 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: indexfieldscontrol.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-09 07:43:43 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_INDEXFIELDSCONTROL_HXX_
 #include "indexfieldscontrol.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
@@ -544,6 +544,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.9  2002/04/09 07:43:43  oj
+ *  #98286# new virtual method GetCellText
+ *
  *  Revision 1.8  2002/03/19 07:21:01  oj
  *  #97274# disable traveling with tab to allow control change
  *
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 887a847aca4a..26c1bfaa95a4 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-09 14:52:06 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_PARAMDIALOG_HRC_
 #include "paramdialog.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_COMMON_TYPES_HXX_
 #include "commontypes.hxx"
@@ -486,6 +486,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.7  2002/04/09 14:52:06  fs
+ *  #98181# use a ::dbtools::OPredicateInputController
+ *
  *  Revision 1.6  2001/07/11 10:10:30  oj
  *  #87257# change GetUILanguage
  *
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index b68ba462d135..3ca48df1cb89 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 23:00:55 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_PARAMDIALOG_HRC_
 #include "paramdialog.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 #define LIST_WIDTH      100
@@ -243,6 +243,9 @@ ModalDialog DLG_PARAMETERS
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.22  2001/11/16 23:00:55  kz
+ *  Merge SRC638: 16.11.01 - 22:59:20
+ *
  *  Revision 1.21  2001/08/29 15:13:53  kz
  *  Merge SRC638: 29.08.01 - 17:13:18
  *
diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc
index ffbf5c82046c..e2b4c303273a 100644
--- a/dbaccess/source/ui/dlg/queryfilter.hrc
+++ b/dbaccess/source/ui/dlg/queryfilter.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryfilter.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef DBAUI_QUERYFILTER_HRC
 #define DBAUI_QUERYFILTER_HRC
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 #define FT_WHEREFIELD   1
diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc
index 06d666e65ba2..663d762a41ec 100644
--- a/dbaccess/source/ui/dlg/queryorder.hrc
+++ b/dbaccess/source/ui/dlg/queryorder.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryorder.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef DBAUI_QUERYORDER_HRC
 #define DBAUI_QUERYORDER_HRC
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 974de7314191..b594c9475577 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlmessage.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 07:38:23 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_SQLMESSAGE_HRC_
 #include "sqlmessage.hrc"
@@ -572,6 +572,9 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, pButton )
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.13  2002/07/22 07:38:23  oj
+ *  #101514# remove resource entries for PLUS and MINUS
+ *
  *  Revision 1.12  2002/04/29 08:27:33  oj
  *  #98772# impl toolbox hi contrast
  *
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index 127cf0958767..49cbd431afc9 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlmessage.src,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: kz $ $Date: 2002-05-02 23:14:37 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:47:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_SQLMESSAGE_HRC_
 #include "sqlmessage.hrc"
@@ -409,6 +409,9 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.33  2002/05/02 23:14:37  kz
+ *  Merge SRX642: 03.05.02 - 01:13:35
+ *
  *  Revision 1.32  2002/04/29 08:34:30  oj
  *  #98772# new resource
  *
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index dc2bf5aa27e9..80e2b2492ecb 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablespage.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-29 08:27:33 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_DLG_HRC_
+#include "dbu_dlg.hrc"
 #endif
 #ifndef _DBAUI_DBADMIN_HRC_
 #include "dbadmin.hrc"
@@ -1477,6 +1477,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.12  2002/04/29 08:27:33  oj
+ *  #98772# impl toolbox hi contrast
+ *
  *  Revision 1.11  2001/11/16 15:25:04  oj
  *  #94891# use &Class::method instead of Class::method
  *
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 6ee30d478f0d..59656373d89e 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DExport.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 12:09:43 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,8 +103,8 @@
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBHELPER_DBCONVERSION_HXX_
 #include <connectivity/dbconversion.hxx>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 0b113ebe3e0c..9c5c6f92ab43 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HtmlReader.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-09 12:32:34 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@
 #ifndef _COMPHELPER_EXTRACT_HXX_
 #include <comphelper/extract.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index f0abbf5d538b..35832fa9560b 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetDrop.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-31 18:08:45 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBAUI_SQLMESSAGE_HXX_
 #include "sqlmessage.hxx"
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index b37ef3768e5e..c169f214be38 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RtfReader.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-28 08:41:21 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,8 +112,8 @@
 #ifndef _RTFTOKEN_H
 #include <svtools/rtftoken.h>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 764167b49c20..f5b6035fea44 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 06:55:19 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -201,8 +201,8 @@
 #ifndef _COM_SUN_STAR_UTIL_XFLUSHABLE_HPP_
 #include <com/sun/star/util/XFlushable.hpp>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index bae0cc856430..15ff8f929367 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCPage.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-05 13:52:33 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef DBAUI_WIZARD_PAGES_HRC
 #include "WizardPages.hrc"
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index c9467852325d..a7ba85a71a04 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WColumnSelect.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 12:04:47 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_WIZ_COLUMNSELECT_HXX
 #include "WColumnSelect.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 532de634ef1f..004dbd7e2c61 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WCopyTable.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 12:02:58 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,8 +107,8 @@
 #ifndef _SV_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX
 #include "WCopyTable.hxx"
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index f94071afb367..48f5d09df7c6 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WNameMatch.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-11 07:20:17 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef DBAUI_WIZARD_PAGES_HRC
 #include "WizardPages.hrc"
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index c910171ff6ae..4cd2ac071491 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WTypeSelect.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-01 10:27:16 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _STREAM_HXX
 #include <tools/stream.hxx>
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 556563c29051..66d44201a8a4 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WizardPages.src,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-15 20:08:42 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_WIZARD_PAGES_HRC
 #include "WizardPages.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index 0f635ea17cc0..e8d11a87770e 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charsets.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2002-03-14 08:54:05 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 #ifndef _DBU_MISCRES_HRC_
 #include "dbumiscres.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _RTL_TENCINFO_H
 #include <rtl/tencinfo.h>
@@ -251,6 +251,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.5  2002/03/14 08:54:05  fs
+ *  #97788# assertion for invalid character set maps corrected
+ *
  *  Revision 1.4  2001/10/15 13:38:09  fs
  *  #93204# new supported charset IBM866 (cyrillic)
  *
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 5ac152b73d8e..18cd9849d467 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.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-01 20:27:29 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBU_MISCRES_HRC_
 #include "dbumiscres.hrc"
@@ -583,40 +583,69 @@ String STR_BUTTON_TEXT_ALL
     Text[ thai ] = "~ทั้งหมด";
 };
 
+String STR_UNDO_COLON
+{
+    Text = "R�ckg�ngig:" ;
+    Text [ ENGLISH ] = "Undo:" ;
+    Text[ english_us ] = "Undo:";
+    Text[ portuguese ] = "Anular:";
+    Text[ russian ] = "��������";
+    Text[ greek ] = "��������";
+    Text[ dutch ] = "Ongedaan";
+    Text[ french ] = "Annuler:";
+    Text[ spanish ] = "Deshacer:";
+    Text[ italian ] = "Annulla:";
+    Text[ danish ] = "Fortryd:";
+    Text[ swedish ] = "�ngra";
+    Text[ polish ] = "Cofnij";
+    Text[ portuguese_brazilian ] = "Undo:";
+    Text[ japanese ] = "元に戻す";
+    Text[ korean ] = "실행취소";
+    Text[ chinese_simplified ] = "撤消命令";
+    Text[ chinese_traditional ] = "復原";
+    Text[ turkish ] = "Undo";
+    Text[ arabic ] = "�����";
+    Text[ catalan ] = "Desf�s:";
+    Text[ finnish ] = "Peruuta:";
+    Text[ thai ] = "เลิกทำ";
+};
+
+String STR_REDO_COLON
+{
+    Text = "Wiederherstellen:" ;
+    Text [ ENGLISH ] = "Redo:" ;
+    Text[ english_us ] = "Redo:";
+    Text[ portuguese ] = "Restaurar:";
+    Text[ russian ] = "������������";
+    Text[ greek ] = "���������";
+    Text[ dutch ] = "Herstellen:";
+    Text[ french ] = "Restaurer:";
+    Text[ spanish ] = "Restaurar:";
+    Text[ italian ] = "Ripristina:";
+    Text[ danish ] = "Gendan:";
+    Text[ swedish ] = "�terst�ll";
+    Text[ polish ] = "Przywr��";
+    Text[ portuguese_brazilian ] = "Redo:";
+    Text[ japanese ] = "やり直し";
+    Text[ korean ] = "복구";
+    Text[ chinese_simplified ] = "恢复撤消命令";
+    Text[ chinese_traditional ] = "恢復撤消指令";
+    Text[ turkish ] = "Redo";
+    Text[ arabic ] = "�����";
+    Text[ catalan ] = "Ref�s";
+    Text[ finnish ] = "Toista ";
+    Text[ thai ] = "ทำซ้ำ";
+};
+
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.46  2002/08/01 20:27:29  kz
+ *  Merge SRX643: 01.08.02 - 22:24:17
+ *
  *  Revision 1.45  2002/07/22 07:39:28  oj
  *  #101514# remove resource entries for PLUS and MINUS
  *
- *  Revision 1.44  2002/06/10 20:12:23  rt
- *  Merge SRX642: 10.06.02 - 22:11:58
- *
- *  Revision 1.43  2002/05/03 08:36:06  kz
- *  Merge SRX642: 03.05.02 - 10:35:45
- *
- *  Revision 1.42  2002/04/29 08:01:21  oj
- *  #98772# new bitmaps
- *
- *  Revision 1.41  2002/03/04 11:04:47  oj
- *  #97788# new character set Big5-HKSCS
- *
- *  Revision 1.40  2001/10/31 21:41:44  kz
- *  Merge SRC641: 31.10.01 - 22:41:50
- *
- *  Revision 1.39  2001/10/25 20:29:45  kz
- *  Merge SRC641: 25.10.01 - 22:28:48
- *
- *  Revision 1.38  2001/10/22 20:43:27  kz
- *  Merge SRC641: 22.10.01 - 22:43:55
- *
- *  Revision 1.37  2001/10/18 20:44:31  vg
- *  Merge SRC641: 18.10.01 - 22:45:04
- *
- *  Revision 1.36  2001/10/15 13:38:09  fs
- *  #93204# new supported charset IBM866 (cyrillic)
- *
- *
  *  Revision 1.0 26.09.00 08:26:13  fs
  ************************************************************************/
 
diff --git a/dbaccess/source/ui/misc/dsntypes.cxx b/dbaccess/source/ui/misc/dsntypes.cxx
index 07e7c739a158..5b2c5a98a61c 100644
--- a/dbaccess/source/ui/misc/dsntypes.cxx
+++ b/dbaccess/source/ui/misc/dsntypes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsntypes.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: hr $ $Date: 2001-08-16 13:00:02 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _DBAUI_DSNTYPES_HXX_
 #include "dsntypes.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
@@ -435,6 +435,9 @@ ADDRESSBOOK_TYPE AddressBookTypes::getAddressType( const String& _rAddressURL )
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.13  2001/08/16 13:00:02  hr
+ *  #65293#: syntax
+ *
  *  Revision 1.12  2001/08/15 13:16:25  oj
  *  #88644# insert some DBG's
  *
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index ab05a09f80c2..df4a85fba5a7 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linkeddocuments.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 06:53:40 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,8 +105,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef _DBAUI_FILENOTATION_HXX_
 #include "filenotation.hxx"
@@ -658,6 +658,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.4  2002/07/25 06:53:40  oj
+ *  #100280# new method to start report autopilot
+ *
  *  Revision 1.3  2001/08/16 14:10:12  fs
  *  #88813# +newFormWithPilot
  *
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index 9b794752d894..7e298541c325 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: singledoccontroller.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-08 08:15:44 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:51:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,8 +89,8 @@
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_MISC_HRC_
+#include "dbu_misc.hrc"
 #endif
 #ifndef DBAUI_DATAVIEW_HXX
 #include "dataview.hxx"
@@ -101,6 +101,9 @@
 #ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
 #endif
+#ifndef DBACCESS_UI_BROWSER_ID_HXX
+#include "browserids.hxx"
+#endif
 
 //........................................................................
 namespace dbaui
@@ -166,6 +169,9 @@ namespace dbaui
         ,OSingleDocumentController_PBASE( getBroadcastHelper() )
         ,m_bOwnConnection( sal_False )
         ,m_bSuspended( sal_False )
+        ,m_bEditable(sal_True)
+        ,m_bModified(sal_False)
+
     {
         registerProperty( PROPERTY_ACTIVECONNECTION, PROPERTY_ID_ACTIVECONNECTION, PropertyAttribute::READONLY | PropertyAttribute::BOUND,
             &m_xConnection, ::getCppuType( &m_xConnection ) );
@@ -391,6 +397,7 @@ namespace dbaui
     void SAL_CALL OSingleDocumentController::disposing()
     {
         OSingleDocumentController_CBASE::disposing();
+        m_aUndoManager.Clear();
 
         disconnect();
 
@@ -488,8 +495,83 @@ namespace dbaui
         return sal_True;
     }
     // -----------------------------------------------------------------------------
+    FeatureState OSingleDocumentController::GetState(sal_uInt16 _nId) const
+    {
+        FeatureState aReturn;
+            // (disabled automatically)
+        aReturn.bEnabled = sal_True;
 
-    //--------------------------------------------------------------------
+        switch (_nId)
+        {
+            case ID_BROWSER_UNDO:
+                aReturn.bEnabled = m_bEditable && m_aUndoManager.GetUndoActionCount() != 0;
+                if ( aReturn.bEnabled )
+                {
+                    String sUndo(ModuleRes(STR_UNDO_COLON));
+                    sUndo += String(RTL_CONSTASCII_USTRINGPARAM(" "));
+                    sUndo += m_aUndoManager.GetUndoActionComment();
+                    aReturn.aState <<= ::rtl::OUString(sUndo);
+                }
+                break;
+            case ID_BROWSER_REDO:
+                aReturn.bEnabled = m_bEditable && m_aUndoManager.GetRedoActionCount() != 0;
+                if ( aReturn.bEnabled )
+                {
+                    String sRedo(ModuleRes(STR_REDO_COLON));
+                    sRedo += String(RTL_CONSTASCII_USTRINGPARAM(" "));
+                    sRedo += m_aUndoManager.GetRedoActionComment();
+                    aReturn.aState <<= ::rtl::OUString(sRedo);
+                }
+                break;
+            default:
+                aReturn = OSingleDocumentController_CBASE::GetState(_nId);
+        }
+        return aReturn;
+    }
+    // -----------------------------------------------------------------------------
+    void OSingleDocumentController::Execute(sal_uInt16 _nId)
+    {
+        switch(_nId)
+        {
+            case SID_CLOSEDOC:
+                closeTask();
+                return;
+                break;
+            case ID_BROWSER_UNDO:
+                m_aUndoManager.Undo();
+                InvalidateFeature(ID_BROWSER_REDO);
+                break;
+            case ID_BROWSER_REDO:
+                m_aUndoManager.Redo();
+                InvalidateFeature(ID_BROWSER_UNDO);
+                break;
+        }
+        InvalidateFeature(_nId);
+    }
+    // -----------------------------------------------------------------------------
+    SfxUndoManager* OSingleDocumentController::getUndoMgr()
+    {
+        return &m_aUndoManager;
+    }
+    // -----------------------------------------------------------------------------
+    void OSingleDocumentController::addUndoActionAndInvalidate(SfxUndoAction *_pAction)
+    {
+        // add undo action
+        m_aUndoManager.AddUndoAction(_pAction);
+        // when we add an undo action the controller was modified
+        setModified(sal_True);
+        // now inform me that or states changed
+        InvalidateFeature(ID_BROWSER_UNDO);
+        InvalidateFeature(ID_BROWSER_REDO);
+    }
+    // -----------------------------------------------------------------------------
+    void OSingleDocumentController::setModified(sal_Bool _bModified)
+    {
+        m_bModified = _bModified;
+        InvalidateFeature(ID_BROWSER_SAVEDOC);
+        InvalidateFeature(ID_BROWSER_SAVEASDOC);
+    }
+    // -----------------------------------------------------------------------------
 //........................................................................
 }   // namespace dbaui
 //........................................................................
@@ -497,6 +579,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.7  2002/07/08 08:15:44  oj
+ *  #97156# check if we are already suspended
+ *
  *  Revision 1.6  2002/05/06 08:50:00  oj
  *  #96363# impl new interface
  *
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 988b42267239..d5e2f81c8281 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinController.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-11 12:05:31 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
@@ -188,8 +188,6 @@ using namespace ::comphelper;
 DBG_NAME(OJoinController);
 // -----------------------------------------------------------------------------
 OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) : OJoinController_BASE(_rM)
-    ,m_bEditable(sal_True)
-    ,m_bModified(sal_False)
     ,m_bViewsAllowed(sal_True)
     ,m_pAddTabDlg(NULL)
 {
@@ -217,7 +215,7 @@ OJoinDesignView* OJoinController::getJoinView()
 void OJoinController::disposing()
 {
     OJoinController_BASE::disposing();
-    m_aUndoManager.Clear();
+
     m_pView         = NULL;
     m_pAddTabDlg    = NULL;
 
@@ -235,26 +233,9 @@ void OJoinController::disposing()
     }
 }
 // -----------------------------------------------------------------------------
-SfxUndoManager* OJoinController::getUndoMgr()
-{
-    return &m_aUndoManager;
-}
-// -----------------------------------------------------------------------------
-void OJoinController::addUndoActionAndInvalidate(SfxUndoAction *_pAction)
-{
-    // add undo action
-    m_aUndoManager.AddUndoAction(_pAction);
-    // when we add an undo action the controller was modified
-    setModified(sal_True);
-    // now inform me that or states changed
-    InvalidateFeature(ID_BROWSER_UNDO);
-    InvalidateFeature(ID_BROWSER_REDO);
-}
-// -----------------------------------------------------------------------------
 void OJoinController::setModified(sal_Bool _bModified)
 {
-    m_bModified = _bModified;
-    InvalidateFeature(ID_BROWSER_SAVEDOC);
+    OJoinController_BASE::setModified(_bModified);
     InvalidateFeature(ID_RELATION_ADD_RELATION);
 }
 // -----------------------------------------------------------------------------
@@ -324,10 +305,10 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const
         case SID_CLOSEDOC:
             break;
         case ID_BROWSER_EDITDOC:
-            aReturn.aState = ::cppu::bool2any(m_bEditable);
+            aReturn.aState = ::cppu::bool2any(isEditable());
             break;
         case ID_BROWSER_SAVEDOC:
-            aReturn.bEnabled = isConnected() && m_bModified;
+            aReturn.bEnabled = isConnected() && isModified();
             break;
         case ID_BROWSER_ADDTABLE:
             if (aReturn.bEnabled = getView() && const_cast< OJoinController* >( this )->getJoinView()->getTableView()->IsAddAllowed())
@@ -335,12 +316,8 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const
             else
                 aReturn.aState = ::cppu::bool2any(sal_False);
             break;
-        case ID_BROWSER_UNDO:
-            aReturn.bEnabled = m_bEditable && m_aUndoManager.GetUndoActionCount() != 0;
-            break;
-        case ID_BROWSER_REDO:
-            aReturn.bEnabled = m_bEditable && m_aUndoManager.GetRedoActionCount() != 0;
-            break;
+        default:
+            aReturn = OJoinController_BASE::GetState(_nId);
     }
     return aReturn;
 }
@@ -349,12 +326,8 @@ void OJoinController::Execute(sal_uInt16 _nId)
 {
     switch(_nId)
     {
-        case SID_CLOSEDOC:
-            closeTask();
-            return;
-            break;
         case ID_BROWSER_EDITDOC:
-            if(m_bEditable)
+            if(isEditable())
             { // the state should be changed to not editable
                 switch (saveModified())
                 {
@@ -370,19 +343,11 @@ void OJoinController::Execute(sal_uInt16 _nId)
                         break;
                 }
             }
-            m_bEditable = !m_bEditable;
-            getJoinView()->setReadOnly(!m_bEditable);
+            setEditable(!isEditable());
+            getJoinView()->setReadOnly(!isEditable());
             InvalidateAll();
             return;
             break;
-        case ID_BROWSER_UNDO:
-            m_aUndoManager.Undo();
-            InvalidateFeature(ID_BROWSER_REDO);
-            break;
-        case ID_BROWSER_REDO:
-            m_aUndoManager.Redo();
-            InvalidateFeature(ID_BROWSER_UNDO);
-            break;
         case ID_BROWSER_ADDTABLE:
             if(!m_pAddTabDlg)
                 m_pAddTabDlg = getJoinView()->getAddTableDialog();
@@ -402,6 +367,8 @@ void OJoinController::Execute(sal_uInt16 _nId)
                 ::dbaui::notifySystemWindow(getView(),m_pAddTabDlg,::comphelper::mem_fun(&TaskPaneList::AddWindow));
             }
             break;
+        default:
+            OJoinController_BASE::Execute(_nId);
     }
     InvalidateFeature(_nId);
 }
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 444c567d92ac..e6c27c9cd485 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinDesignView.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-11 12:05:32 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,8 +85,8 @@
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index b36a4ae650e7..8a7edd2a5a1e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinTableView.cxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:21:02 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@
 #ifndef DBAUI_JOINDESIGNVIEW_HXX
 #include "JoinDesignView.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 02994765bcc9..fd3ce31e38f4 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QTableWindow.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:21:02 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,8 +86,8 @@
 #ifndef DBAUI_TABLEWINDOWLISTBOX_HXX
 #include "TableWindowListBox.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index cecf50b58318..2c0d121b9eef 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignFieldUndoAct.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-05 06:49:18 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef DBAUI_GENERALUNDO_HXX
 #include "GeneralUndo.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX
 #include "SelectionBrowseBox.hxx"
@@ -81,16 +81,16 @@ namespace dbaui
     class OQueryDesignFieldUndoAct : public OCommentUndoAction
     {
     protected:
-        OSelectionBrowseBox*        pOwner;
-        long                    m_nColId;
+        OSelectionBrowseBox*    pOwner;
+        USHORT                  m_nColumnPostion;
 
         virtual void    Undo() = 0;
         virtual void    Redo() = 0;
 
     public:
-        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID), pOwner(pSelBrwBox), m_nColId(-1) { }
+        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID), pOwner(pSelBrwBox), m_nColumnPostion(BROWSER_INVALIDID) { }
 
-        void SetColId(long nCol) { m_nColId = nCol; }
+        inline void SetColumnPosition(USHORT _nColumnPostion) { m_nColumnPostion = _nColumnPostion; }
     };
 
     // ================================================================================================
@@ -105,10 +105,10 @@ namespace dbaui
     public:
         OTabFieldCellModifiedUndoAct(OSelectionBrowseBox* pSelBrwBox)
             : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_MODIFY_CELL)
-            ,m_nCellIndex(-1){ }
+            ,m_nCellIndex(BROWSER_INVALIDID){ }
 
-        void SetCellContents(const String& str) { m_strNextCellContents = str; }
-        void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; }
+        inline void SetCellContents(const String& str)  { m_strNextCellContents = str; }
+        inline void SetCellIndex(sal_Int32 nIndex)      { m_nCellIndex = nIndex; }
 
         virtual void Undo();
         virtual void Redo() { Undo(); }
@@ -125,7 +125,7 @@ namespace dbaui
     public:
         OTabFieldSizedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_SIZE_COLUMN), m_nNextWidth(0) { }
 
-        void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; }
+        inline void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; }
 
         virtual void Undo();
         virtual void Redo() { Undo(); }
@@ -138,15 +138,11 @@ namespace dbaui
     {
     protected:
         OTableFieldDescRef      pDescr;     // geloeschte Spaltenbeschreibung
-        BOOL                    m_bOwnerOfDescription;
 
     public:
         OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
-        virtual ~OTabFieldUndoAct() { pDescr = NULL; }
 
         void SetTabFieldDescr(OTableFieldDescRef pDescription) { pDescr = pDescription; }
-            // anschliessend bitte SetOwnership
-        void SetOwnership(BOOL bTakeIt) { m_bOwnerOfDescription = bTakeIt; }
     };
 
     // ================================================================================================
@@ -155,8 +151,8 @@ namespace dbaui
     class OTabFieldDelUndoAct : public OTabFieldUndoAct
     {
     protected:
-        virtual void Undo() { pOwner->InsertColumn(pDescr, m_nColId); SetOwnership(FALSE); }
-        virtual void Redo() { pOwner->RemoveColumn((USHORT)m_nColId); SetOwnership(TRUE); }
+        virtual void Undo() { pOwner->InsertColumn(pDescr, m_nColumnPostion); }
+        virtual void Redo() { pOwner->RemoveColumn(pDescr->GetColumnId()); }
 
     public:
         OTabFieldDelUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDDELETE) { }
@@ -168,12 +164,28 @@ namespace dbaui
     class OTabFieldCreateUndoAct : public OTabFieldUndoAct
     {
     protected:
-        virtual void Undo() { pOwner->RemoveColumn((USHORT)m_nColId); SetOwnership(TRUE); }
-        virtual void Redo() { pOwner->InsertColumn(pDescr, m_nColId); SetOwnership(FALSE); }
+        virtual void Undo() { pOwner->RemoveColumn(pDescr->GetColumnId());}
+        virtual void Redo() { pOwner->InsertColumn(pDescr, m_nColumnPostion);}
 
     public:
         OTabFieldCreateUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDCREATE) { }
     };
+
+    // ================================================================================================
+    // OTabFieldMovedUndoAct - Undo-class when a field was moved inside the selection
+
+    class OTabFieldMovedUndoAct : public OTabFieldUndoAct
+    {
+    protected:
+        virtual void Undo();
+        virtual void Redo()
+        {
+            Undo();
+        }
+
+    public:
+        OTabFieldMovedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDMOVED) { }
+    };
 }
 #endif // DBAUI_QUERYDESIGNFIELDUNDOACT_HXX
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 00863dee9672..aa1b739e7833 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignView.cxx,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:21:18 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:58:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,8 +100,8 @@
 #ifndef DBAUI_TABLEFIELDDATA_HXX
 #include "TableFieldData.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _UTL_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
@@ -678,9 +678,9 @@ namespace
         for(;aIter != _rFieldList.end();++aIter)
         {
             OTableFieldDescRef pEntryField = *aIter;
-            if(pEntryField->IsVisible())
+            if ( pEntryField->IsVisible() )
             {
-                if(pEntryField->GetField().toChar() == '*')
+                if ( pEntryField->GetField().toChar() == '*' )
                     bAsterix = sal_True;
                 ++nVis;
             }
@@ -1434,7 +1434,7 @@ namespace
             aDragLeft->SetField(aCondition);
             aDragLeft->SetFunctionType(FKT_CONDITION);
 
-            eErrorCode = _pSelectionBrw->InsertField(aDragLeft,-1,sal_False,sal_True).isValid() ? eOk : eTooManyColumns;
+            eErrorCode = _pSelectionBrw->InsertField(aDragLeft,BROWSER_INVALIDID,sal_False,sal_True).isValid() ? eOk : eTooManyColumns;
         }
         else //! TODO not supported yet
             eErrorCode = eStatementTooComplex;
@@ -1882,7 +1882,7 @@ namespace
                                                     // now we have to insert the fields which aren't in the statement
                                                     OTableFields& rUnUsedFields = pController->getUnUsedFields();
                                                     for(OTableFields::iterator aIter = rUnUsedFields.begin();aIter != rUnUsedFields.end();++aIter)
-                                                        if(_pSelectionBrw->InsertField(*aIter,-1,sal_False,sal_False).isValid())
+                                                        if(_pSelectionBrw->InsertField(*aIter,BROWSER_INVALIDID,sal_False,sal_False).isValid())
                                                             (*aIter) = NULL;
                                                     OTableFields().swap( rUnUsedFields );
                                                 }
@@ -2468,7 +2468,7 @@ void OQueryDesignView::SaveTabWinUIConfig(OQueryTableWindow* pWin)
 // -----------------------------------------------------------------------------
 SqlParseError OQueryDesignView::InsertField( const OTableFieldDescRef& rInfo, sal_Bool bVis, sal_Bool bActivate)
 {
-    return m_pSelectionBox->InsertField( rInfo, -1,bVis, bActivate ).isValid() ? eOk : eTooManyColumns;
+    return m_pSelectionBox->InsertField( rInfo, BROWSER_INVALIDID,bVis, bActivate ).isValid() ? eOk : eTooManyColumns;
 }
 // -----------------------------------------------------------------------------
 sal_Bool OQueryDesignView::getColWidth( const ::rtl::OUString& rAliasName, const ::rtl::OUString& rFieldName, sal_uInt32& nWidth )
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index dd37c71fc74f..d1c2eceb2a39 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryMoveTabWinUndoAct.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-27 14:24:23 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX
 #include "QueryDesignUndoAction.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _SV_GEN_HXX
 #include <tools/gen.hxx>
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index c35d5323bb7d..e34e15e9f6cd 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QuerySizeTabWinUndoAct.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-27 14:24:23 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX
 #include "QueryDesignUndoAction.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index 5031055a6c62..4c6200d1498a 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTabConnUndoAction.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 08:15:30 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@
 #ifndef DBAUI_QUERYTABWINSHOWUNDOACT_HXX
 #include "QueryTabWinShowUndoAct.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index bab154b571b5..97ea2ef0574a 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTabWinUndoAct.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:22:08 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,7 +90,6 @@ DBG_NAME(OQueryTabWinUndoAct )
 OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID)
     :OQueryDesignUndoAction(pOwner, nCommentID)
     ,m_pTabWin(NULL)
-    ,m_bOwnerOfObjects(FALSE)
 {
     DBG_CTOR(OQueryTabWinUndoAct ,NULL);
 }
@@ -122,19 +121,29 @@ OQueryTabWinUndoAct::~OQueryTabWinUndoAct()
 //------------------------------------------------------------------------------
 void OTabFieldCellModifiedUndoAct::Undo()
 {
-    String strNext = pOwner->GetCellContents(m_nCellIndex, m_nColId);
-    pOwner->SetCellContents(m_nCellIndex, m_nColId, m_strNextCellContents);
+    String strNext = pOwner->GetCellContents(m_nCellIndex, m_nColumnPostion);
+    pOwner->SetCellContents(m_nCellIndex, m_nColumnPostion, m_strNextCellContents);
     m_strNextCellContents = strNext;
 }
 
 //------------------------------------------------------------------------------
 void OTabFieldSizedUndoAct::Undo()
 {
-    long nNextWidth = pOwner->GetColumnWidth(m_nColId);
-    pOwner->SetColWidth(m_nColId, m_nNextWidth);
+    long nNextWidth = pOwner->GetColumnWidth(m_nColumnPostion);
+    pOwner->SetColWidth(m_nColumnPostion, m_nNextWidth);
     m_nNextWidth = nNextWidth;
 }
 // -----------------------------------------------------------------------------
+void OTabFieldMovedUndoAct::Undo()
+{
+    sal_uInt16 nId = pDescr->GetColumnId();
+    USHORT nOldPos = pOwner->GetColumnPos(nId);
+    pOwner->SetColumnPos(nId,m_nColumnPostion);
+    pOwner->ColumnMoved(nId,FALSE);
+    m_nColumnPostion = nOldPos;
+}
+// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 3af4fbc03f6a..b74d3aba1e71 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTableView.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:21:02 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,8 +140,8 @@
 #ifndef DBAUI_QUERYDESIGNVIEW_HXX
 #include "QueryDesignView.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 58ca167bbabe..f67333b03a11 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryTextView.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-29 08:28:58 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,8 @@
 #ifndef DBAUI_QUERYCONTROLLER_HXX
 #include "querycontroller.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index df0f6cd70aca..e9404cad068d 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryViewSwitch.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-08 11:47:17 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 40f315b4b5c7..a74c3b1083fe 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SelectionBrowseBox.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-21 07:06:39 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,8 +88,8 @@
 #ifndef DBAUI_TABLEFIELDINFO_HXX
 #include "TableFieldInfo.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
@@ -115,9 +115,7 @@
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef __SGI_STL_ROPE
 #include <rope>
-#endif
 #ifndef DBAUI_QUERYDESIGNFIELDUNDOACT_HXX
 #include "QueryDesignFieldUndoAct.hxx"
 #endif
@@ -150,15 +148,16 @@ const String g_strOne = String::CreateFromAscii("1");
 const String g_strZero = String::CreateFromAscii("0");
 
 #define DEFAULT_QUERY_COLS  20
-#define DEFAULT_SIZE    GetTextWidth(g_strZero) * 30
-#define CHECKBOX_SIZE   10
-#define HANDLE_ID   0
+#define DEFAULT_SIZE        GetTextWidth(g_strZero) * 30
+#define CHECKBOX_SIZE       10
+#define HANDLE_ID            0
+#define HANDLE_COLUMN_WITDH 70
 
 DBG_NAME(OSelectionBrowseBox);
 //------------------------------------------------------------------------------
 OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
-                   :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT | BROWSER_KEEPSELECTION |
-                                  BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL)
+                   :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION |  BROWSER_HIDESELECT |
+                                  BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL )
                    ,m_nVisibleCount(0)
                    ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS))
                    ,m_bOrderByUnRelated(sal_True)
@@ -169,7 +168,10 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
     DBG_CTOR(OSelectionBrowseBox,NULL);
     SetHelpId(HID_CTL_QRYDGNCRIT);
 
-    m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL;
+    m_nMode =       BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT
+                |   BROWSER_KEEPSELECTION   | BROWSER_HIDECURSOR
+                |   BROWSER_HLINESFULL      | BROWSER_VLINESFULL
+                |   BROWSER_HEADERBAR_NEW   ;
 
     m_pTextCell     = new Edit(&GetDataWindow(), 0);
     //  m_pTextCell->EnableSpecialCheck(sal_False);
@@ -189,8 +191,8 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
     // TriState der ::com::sun::star::form::CheckBox abschalten
     m_pVisibleCell->GetBox().EnableTriState( sal_False );
 
-    m_pEmptyEntry = new OTableFieldDesc();
-    m_pEmptyEntry->SetColWidth(DEFAULT_SIZE);
+//  m_pEmptyEntry = new OTableFieldDesc();
+//  m_pEmptyEntry->SetColWidth(DEFAULT_SIZE);
 
     Font aTitleFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguage(),DEFAULTFONT_FLAGS_ONLYONE);
     aTitleFont.SetSize(Size(0, 6));
@@ -223,8 +225,6 @@ OSelectionBrowseBox::~OSelectionBrowseBox()
     delete m_pTableCell;
     delete m_pOrderCell;
     delete m_pFunctionCell;
-
-    m_pEmptyEntry = NULL;
 }
 // -----------------------------------------------------------------------------
 void OSelectionBrowseBox::initialize()
@@ -273,13 +273,95 @@ OQueryDesignView* OSelectionBrowseBox::getDesignView() const
     OSL_ENSURE(static_cast<const OQueryDesignView*>(GetParent()),"Parent isn't an OQueryDesignView!");
     return static_cast<OQueryDesignView*>(GetParent());
 }
+namespace
+{
+    class OSelectionBrwBoxHeader : public ::svt::EditBrowserHeader
+    {
+        EditBrowseBox* m_pBrowseBox;
+    protected:
+        virtual void Select();
+    public:
+        OSelectionBrwBoxHeader(EditBrowseBox* pParent);
+    };
+    OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(EditBrowseBox* pParent)
+        : ::svt::EditBrowserHeader(pParent,WB_BUTTONSTYLE|WB_DRAG)
+        ,m_pBrowseBox(pParent)
+    {
+    }
+
+    void OSelectionBrwBoxHeader::Select()
+    {
+        EditBrowserHeader::Select();
+
+        BrowserMode nMode = m_pBrowseBox->GetMode();
+        if ( 0 == m_pBrowseBox->GetSelectColumnCount() )
+        {
+            m_pBrowseBox->DeactivateCell();
+            // wenn es schon eine selektierte Spalte gibt, bin ich schon im richtigen Modus
+            if ( BROWSER_HIDESELECT == ( nMode & BROWSER_HIDESELECT ) )
+            {
+                nMode &= ~BROWSER_HIDESELECT;
+                nMode |= BROWSER_MULTISELECTION;
+                m_pBrowseBox->SetMode( nMode );
+            }
+        }
+        m_pBrowseBox->SelectColumnId( GetCurItemId() );
+    }
+}
 
+// -----------------------------------------------------------------------------
+BrowserHeader* OSelectionBrowseBox::imp_CreateHeaderBar(BrowseBox* pParent)
+{
+    return new OSelectionBrwBoxHeader(this);
+}
+// -----------------------------------------------------------------------------
+void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
+{
+    EditBrowseBox::ColumnMoved( nColId );
+    // swap the two columns
+    USHORT nNewPos = GetColumnPos( nColId );
+    OTableFields& rFields = getFields();
+    if ( rFields.size() > USHORT(nNewPos-1) )
+    {
+        USHORT nOldPos = 0;
+        OTableFields::iterator aEnd = rFields.end();
+        OTableFields::iterator aIter = rFields.begin();
+        for (; aIter != aEnd && ( (*aIter)->GetColumnId() != nColId ); ++aIter,++nOldPos)
+            ;
+
+        OSL_ENSURE( (nNewPos-1) != nOldPos,"Old and new position are equal!");
+        OTableFieldDescRef pOldEntry = rFields[nOldPos];
+        rFields.erase(rFields.begin() + nOldPos);
+        rFields.insert(rFields.begin() + nNewPos - 1,pOldEntry);
+
+        // create the undo action
+        if ( _bCreateUndo )
+        {
+            OTabFieldMovedUndoAct* pUndoAct = new OTabFieldMovedUndoAct(this);
+            pUndoAct->SetColumnPosition( nOldPos + 1);
+            pUndoAct->SetTabFieldDescr(pOldEntry);
+
+            getDesignView()->getController()->addUndoActionAndInvalidate(pUndoAct);
+        }
+    }
+    else
+        OSL_ENSURE(0,"Invalid column id!");
+}
 //------------------------------------------------------------------------------
 void OSelectionBrowseBox::Init()
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
+
     EditBrowseBox::Init();
 
+    // set the header bar
+    BrowserHeader* pHeader = CreateHeaderBar(this);
+    pHeader->SetMouseTransparent(sal_False);
+
+    SetHeaderBar(pHeader);
+    SetMode(m_nMode);
+
+
     SetMapMode( MapMode(MAP_TWIP) );
     GetDataWindow().SetMapMode( GetMapMode() );
 
@@ -336,7 +418,7 @@ void OSelectionBrowseBox::PreFill()
     DeactivateCell();
 
     RemoveColumns();
-    InsertHandleColumn( 70 );
+    InsertHandleColumn( HANDLE_COLUMN_WITDH );
     SetUpdateMode(sal_True);
 }
 //------------------------------------------------------------------------------
@@ -351,7 +433,7 @@ void OSelectionBrowseBox::ClearAll()
     for(sal_uInt16 nId=getFields().size();aIter != getFields().rend();++aIter,--nId)
     {
         if(!(*aIter)->IsEmpty())
-            RemoveField(nId);
+            RemoveField(GetColumnId(nId));
     }
     SetUpdateMode(sal_True);
 }
@@ -412,7 +494,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& rController, long nR
     OQueryController* pController = static_cast<OQueryController*>(static_cast<OQueryController*>(getDesignView()->getController()));
 
 
-    OTableFieldDescRef pEntry = getFields()[nColId-1];
+    OTableFieldDescRef pEntry = getFields()[GetColumnPos(nColId)-1];
     DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::InitController : keine FieldDescription !");
     long nCellIndex = GetRealRow(nRow);
 
@@ -570,8 +652,9 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                 String aFieldName(m_pFieldCell->GetText());
                 if (!aFieldName.Len())
                 {
-                    OTableFieldDescRef aRef = new OTableFieldDesc();
-                    ::std::replace(getFields().begin(),getFields().end(),pEntry,aRef);
+                    OTableFieldDescRef pNewEntry = new OTableFieldDesc();
+                    pNewEntry->SetColumnId( pEntry->GetColumnId() );
+                    ::std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry);
                     sal_uInt16 nCol = GetCurColumnId();
                     for (int i = 0; i < m_nVisibleCount; i++)   // Spalte neu zeichnen
                         RowModified(i,nCol);
@@ -1010,7 +1093,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
         RowModified(BROW_VIS_ROW, GetCurColumnId());
 
         // wenn noetig neue freie Spalten anlegen
-        long nDummy;
+        USHORT nDummy;
         CheckFreeColumns(nDummy);
     }
 
@@ -1037,8 +1120,9 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
     rDev.SetClipRegion( rRect );
 
     OTableFieldDescRef pEntry = NULL;
-    if(getFields().size() > sal_uInt16(nColumnId - 1))
-        pEntry = getFields()[nColumnId - 1];
+    USHORT nPos = GetColumnPos(nColumnId);
+    if(getFields().size() > sal_uInt16(nPos - 1))
+        pEntry = getFields()[nPos - 1];
 
     if (!pEntry.isValid())
         return;
@@ -1068,38 +1152,31 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::RemoveColumn(sal_uInt16 nColId)
+void OSelectionBrowseBox::RemoveColumn(USHORT _nColumnId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController());
 
+    USHORT nPos = GetColumnPos(_nColumnId);
         // das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
-    DBG_ASSERT((nColId == 0) || (nColId <= getFields().size()), "OSelectionBrowseBox::RemoveColumn : invalid parameter nColId");
+    DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::RemoveColumn : invalid parameter nColId");
         // ColId ist bei mir gleichbedeutend mit Position, und da sollte die Bedingung natuerlich zutreffen
 
     sal_uInt16 nCurCol = GetCurColumnId();
     long nCurRow = GetCurRow();
 
     DeactivateCell();
-    // Spalteninfo rausnehmen und am Ende neues Info einfuegen
-    getFields().erase( getFields().begin() + ((sal_uInt32)nColId - 1) );
-        // der Aufrufer ist dafuer verantwortlich, sich vorher die Description zu besorgen und die irgendwie aufzuraeumen
-        // (im Normalfall wohl erst mal in ein Undo zu schieben)
-    OTableFieldDescRef pNew = new OTableFieldDesc();
-    getFields().push_back(pNew);
-
-    // Nachfolgende Spalten optisch verschieben
-    sal_uInt16 nCount = (sal_uInt16)ColCount();
-        // (das funktioniert nur, weil hier Column-Id gleich Column-Pos ist)
-    for (sal_uInt16 i = nColId; i < nCount; i++)
-        SetColumnWidth(i, GetColumnWidth(i + 1));
-
-    // letzte Spalte erhaelt den default Wert
-    SetColumnWidth(nCount-1, DEFAULT_SIZE);
-    pNew->SetColWidth(DEFAULT_SIZE);
+
+    getFields().erase( getFields().begin() + (nPos - 1) );
+    OTableFieldDescRef pEntry = new OTableFieldDesc();
+    pEntry->SetColumnId(_nColumnId);
+    getFields().push_back(pEntry);
+
+    EditBrowseBox::RemoveColumn( _nColumnId );
+    InsertDataColumn( _nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND);
 
     // Neuzeichnen
-    Rectangle aInvalidRect = GetInvalidRect( nColId );
+    Rectangle aInvalidRect = GetInvalidRect( _nColumnId );
     Invalidate( aInvalidRect );
 
     ActivateCell( nCurRow, nCurCol );
@@ -1110,24 +1187,24 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 nColId)
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::RemoveField(sal_uInt16 nId, sal_Bool bActivate)
+void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId, sal_Bool bActivate)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController());
 
-    OSL_ENSURE(getFields().size() > sal_uInt16(nId-1),"ID is to great!");
+    USHORT nPos = GetColumnPos(nColumnId);
+    OSL_ENSURE(getFields().size() > sal_uInt16(nPos-1),"ID is to great!");
 
-    OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nId - 1)) ;
-    pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nId) );  // hat er sich vorher leider nicht gemerkt
+    OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nPos - 1)) ;
+    pDesc->SetColWidth( (sal_uInt16)GetColumnWidth(nColumnId) );    // hat er sich vorher leider nicht gemerkt
 
     // UndoAction erzeugen
     OTabFieldDelUndoAct* pUndoAction = new OTabFieldDelUndoAct( this );
     pUndoAction->SetTabFieldDescr(pDesc);
-    pUndoAction->SetOwnership(sal_True);
-    pUndoAction->SetColId( nId );
+    pUndoAction->SetColumnPosition(nPos);
     pController->addUndoActionAndInvalidate( pUndoAction );
 
-    RemoveColumn(nId);
+    RemoveColumn(nColumnId);
 
     invalidateUndoRedo();
 }
@@ -1244,7 +1321,7 @@ sal_Int8 OSelectionBrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& _rEvt
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt )
+OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     // es koennen mehrere angelegt werden, aber der Erste
@@ -1252,10 +1329,12 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt )
     sal_uInt32 nCount = getFields().size();
     for (sal_uInt16 i=0 ; i<nCnt ; i++)
     {
-//      pNewDesc = new OTableFieldDesc();
-//      pNewDesc->SetColWidth(DEFAULT_SIZE);
-        getFields().push_back(m_pEmptyEntry);
-        InsertDataColumn((sal_uInt16)getFields().size(), String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND);
+        OTableFieldDescRef pEmptyEntry = new OTableFieldDesc();
+        getFields().push_back(pEmptyEntry);
+        USHORT nColumnId = getFields().size();
+        pEmptyEntry->SetColumnId( nColumnId );
+
+        InsertDataColumn( nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND);
     }
 
     return getFields()[nCount];
@@ -1276,11 +1355,11 @@ void OSelectionBrowseBox::DeleteFields(const String& rAliasName)
 
         OTableFields::reverse_iterator aIter = getFields().rbegin();
         OTableFieldDescRef pEntry = NULL;
-        for(sal_Int32 nPos=getFields().size();aIter != getFields().rend();++aIter,--nPos)
+        for(USHORT nPos=getFields().size();aIter != getFields().rend();++aIter,--nPos)
         {
             pEntry = *aIter;
             if (pEntry->GetAlias() == ::rtl::OUString(rAliasName) )
-                RemoveField((sal_uInt16)nPos, sal_False);
+                RemoveField(GetColumnId(nPos), sal_False);
         }
 
         if (bWasEditing)
@@ -1343,12 +1422,12 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, long& nColId)
+void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColumnPostion)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController());
         // das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
-    DBG_ASSERT(sal_uInt16(nColId == -1) || (nColId <= (long)getFields().size()), "OSelectionBrowseBox::InsertColumn : invalid parameter nColId.");
+    DBG_ASSERT(_nColumnPostion == BROWSER_INVALIDID || (_nColumnPostion <= (long)getFields().size()), "OSelectionBrowseBox::InsertColumn : invalid parameter nColId.");
         // -1 heisst ganz hinten, Count heisst ganz hinten, der Rest bezeichnet eine richtige Position
 
     sal_uInt16 nCurCol = GetCurColumnId();
@@ -1356,42 +1435,38 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, long& nColId)
 
     DeactivateCell();
 
-    // Gueltigkeit von nColId pruefen (ColId von 1 bis ...)
+    // remember the column id of the current positon
+    USHORT nColumnId = GetColumnId(_nColumnPostion);
     // Wenn zu klein oder zu gross, auf Ende der Liste setzen
-    if ((nColId == -1) || (sal_uInt16(nColId) >= getFields().size()))    // Anhaengen des Feldes
+    if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size()))   // Anhaengen des Feldes
     {
-        if (FindFirstFreeCol(nColId) == NULL)   // keine freie Column mehr
+        if (FindFirstFreeCol(_nColumnPostion) == NULL)  // keine freie Column mehr
         {
             AppendNewCol(1);
-            nColId = getFields().size();
+            _nColumnPostion = getFields().size();
         }
         else
-            ++nColId; // innerhalb der vorgegebenen Liste
+            ++_nColumnPostion; // innerhalb der vorgegebenen Liste
+        nColumnId = GetColumnId(_nColumnPostion);
+        pEntry->SetColumnId( nColumnId );
+        getFields()[ _nColumnPostion - 1] = pEntry;
     }
 
-    // in Liste der Spaltenbeschreibungen neues Element
-    getFields().insert( getFields().begin()+(sal_uInt32)nColId-1 ,pEntry);
-    // da ich meine Spaltenzahl immer auf dem selben Wert wie die Zahl der FieldDescriptions halten muss (plus 1, da es eine
-    // HandleClumn gibt), muss ich fuer diese gerade eingefuegte Description auch eine loeschen
-    long nFirstFreeCol = -1;
-    CheckFreeColumns(nFirstFreeCol);
-        // (es kann sein, dass es keine leere gab, dann erzwingt CheckFreeColumns das)
-
-    getFields().erase(getFields().begin()+(sal_uInt16)nFirstFreeCol);
-
-    // jetzt kann wieder keine leere Spalte vorhanden sein (falls naemlich die soeben geloeschte die einzige war) ...
-    CheckFreeColumns(nFirstFreeCol);
-
-    // Nachfolgende Spalten optisch verschieben
-    sal_uInt16 nCount = (sal_uInt16)getFields().size();
-    for (sal_uInt16 i = nCount-1; i > nColId; --i)
-        SetColumnWidth(i, GetColumnWidth(i - 1));
-
-    // Spaltenbreite setzen
-    SetColumnWidth((sal_uInt16)nColId, pEntry->GetColWidth() );
+    // check if the column ids are identical, if not we have to move
+    if ( pEntry->GetColumnId() != nColumnId )
+    {
+        USHORT nOldPosition = GetColumnPos(pEntry->GetColumnId());
+        OSL_ENSURE( nOldPosition != 0,"Old position was 0. Not possible!");
+        SetColumnPos(pEntry->GetColumnId(),_nColumnPostion);
+        // we have to delete an empty field for the fields list, because the columns must have equal length
+        if ( nOldPosition > 0 && nOldPosition <= getFields().size() )
+            getFields()[nOldPosition - 1] = pEntry;
+
+        ColumnMoved(pEntry->GetColumnId(),FALSE);
+    }
 
     // Neuzeichnen
-    Rectangle aInvalidRect = GetInvalidRect( (sal_uInt16)nColId );
+    Rectangle aInvalidRect = GetInvalidRect( pEntry->GetColumnId() );
     Invalidate( aInvalidRect );
 
     ActivateCell( nCurRow, nCurCol );
@@ -1401,7 +1476,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, long& nColId)
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, long nColId, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(jxdSource.pListBox->GetTabWin());
@@ -1424,11 +1499,11 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
     aInfo->SetDataType(pInf->GetDataType());
     aInfo->SetVisible(bVis);
 
-    return InsertField(aInfo, nColId, bVis, bActivate);
+    return InsertField(aInfo, _nColumnPostion, bVis, bActivate);
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, long nColId, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
 
@@ -1438,7 +1513,7 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r
         SaveModified();
 
     // Neue Spaltenbeschreibung
-    OTableFieldDescRef pEntry = _rInfo;//new OTableFieldDesc(*_rInfo);
+    OTableFieldDescRef pEntry = _rInfo;
     pEntry->SetVisible(bVis);
     sal_uInt32 nColWidth;
     if( getDesignView()->getColWidth(_rInfo->GetAlias(), _rInfo->GetField(), nColWidth) )
@@ -1447,13 +1522,12 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r
         pEntry->SetColWidth( (sal_uInt16)DEFAULT_SIZE );
 
     // Spalte einfuegen
-    InsertColumn( pEntry, nColId );
+    InsertColumn( pEntry, _nColumnPostion );
 
     // UndoAction erzeugen
     OTabFieldCreateUndoAct* pUndoAction = new OTabFieldCreateUndoAct( this );
     pUndoAction->SetTabFieldDescr( pEntry );
-    pUndoAction->SetOwnership(sal_False);
-    pUndoAction->SetColId( nColId );
+    pUndoAction->SetColumnPosition(_nColumnPostion);
     getDesignView()->getController()->addUndoActionAndInvalidate( pUndoAction );
 
     return pEntry;
@@ -1479,18 +1553,22 @@ sal_uInt16 OSelectionBrowseBox::FieldsCount()
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol( long& rCol )
+OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPosition )
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController());
 
     OTableFields::iterator aIter = getFields().begin();
-    rCol = -1;
-    while (aIter != getFields().end())
+    OTableFields::iterator aEnd  = getFields().end();
+
+    _rColumnPosition = BROWSER_INVALIDID;
+
+    while ( aIter != aEnd )
     {
-        ++rCol;
-        if ((*aIter).isValid() && (*aIter)->IsEmpty())
-            return *aIter;
+        ++_rColumnPosition;
+        OTableFieldDescRef pEntry = (*aIter);
+        if ( pEntry.isValid() && pEntry->IsEmpty() )
+            return pEntry;
         ++aIter;
     }
 
@@ -1498,14 +1576,14 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol( long& rCol )
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::CheckFreeColumns(long& rCol)
+void OSelectionBrowseBox::CheckFreeColumns(USHORT& _rColumnPosition)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    if (FindFirstFreeCol(rCol) == NULL)
+    if (FindFirstFreeCol(_rColumnPosition) == NULL)
     {
         // es ist voll, also einen Packen Spalten anhaengen
         AppendNewCol(DEFAULT_QUERY_COLS);
-        OSL_VERIFY(FindFirstFreeCol(rCol).isValid());
+        OSL_VERIFY(FindFirstFreeCol(_rColumnPosition).isValid());
     }
 }
 //------------------------------------------------------------------------------
@@ -1753,7 +1831,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                 }
             }
 
-            sal_uInt16 nColId = GetColumnAtXPosPixel( aMenuPos.X() );
+            sal_uInt16 nColId = GetColumnId(GetColumnAtXPosPixel( aMenuPos.X() ));
             long   nRow = GetRowAtYPosPixel( aMenuPos.Y() );
 
             if (nRow < 0 && nColId > HANDLE_ID )
@@ -1863,11 +1941,11 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis)
 //------------------------------------------------------------------------------
 long OSelectionBrowseBox::GetBrowseRow(long nRowId) const
 {
-    long nCount(0);
-    for(long i=0;i<nRowId;i++)
+    USHORT nCount(0);
+    for(USHORT i = 0 ; i < nRowId ; ++i)
     {
-        if(m_bVisibleRow[i])
-            nCount++;
+        if ( m_bVisibleRow[i] )
+            ++nCount;
     }
     return nCount;
 }
@@ -1876,7 +1954,8 @@ long OSelectionBrowseBox::GetRealRow(long nRowId) const
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     long nErg=0,i;
-    for(i=0;i < (long)m_bVisibleRow.size(); i++)
+    long nCount = m_bVisibleRow.size();
+    for(i=0;i < nCount; ++i)
     {
         if(m_bVisibleRow[i])
         {
@@ -1927,7 +2006,10 @@ void OSelectionBrowseBox::SetNoneVisbleRow(long nRows)
 String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    OTableFieldDescRef pEntry = getFields()[nColId-1];
+
+    USHORT nPos = GetColumnPos(nColId);
+
+    OTableFieldDescRef pEntry = getFields()[nPos-1];
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... ");
     if(pEntry->IsEmpty())
         return String();
@@ -2006,13 +2088,14 @@ sal_Bool OSelectionBrowseBox::GetFunktionName(String& rFkt)
     return bErg;
 }
 //------------------------------------------------------------------------------
-String OSelectionBrowseBox::GetCellContents(sal_uInt16 nCellIndex, long nColId)
+String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     //  DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross");
     SaveModified();
 
-    OTableFieldDescRef pEntry = getFields()[nColId - 1];
+    USHORT nPos = GetColumnPos(nColId);
+    OTableFieldDescRef pEntry = getFields()[nPos - 1];
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellContents : invalid column id, prepare for GPF ... ");
 
     switch (nCellIndex)
@@ -2027,19 +2110,20 @@ String OSelectionBrowseBox::GetCellContents(sal_uInt16 nCellIndex, long nColId)
             return String(nIdx);
         }
         default:
-            return GetCellText(nCellIndex, (sal_uInt16)nColId);
+            return GetCellText(nCellIndex, nColId);
     }
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::SetCellContents(sal_uInt16 nRow, long nColId, const String& strNewText)
+void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const String& strNewText)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(nRow) && (GetCurRow() == GetBrowseRow(nRow));
+    sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<USHORT>(nRow)) && (GetCurRow() == static_cast<USHORT>(GetBrowseRow(nRow)));
     if (bWasEditing)
         DeactivateCell();
 
-    OTableFieldDescRef pEntry = getEntry(nColId - 1);
+    USHORT nPos = GetColumnPos(nColId);
+    OTableFieldDescRef pEntry = getEntry(nPos - 1);
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... ");
 
 
@@ -2076,15 +2160,15 @@ void OSelectionBrowseBox::SetCellContents(sal_uInt16 nRow, long nColId, const St
     }
 
     long nCellIndex = GetRealRow(nRow);
-    if(IsRowVisible(nRow))
-        RowModified(nCellIndex, (sal_uInt16)nColId);
+    if(IsRowVisible(static_cast<USHORT>(nRow)))
+        RowModified(nCellIndex, nColId);
 
     // die entsprechende Feld-Beschreibung ist jetzt leer -> Visible auf sal_False (damit das konsistent mit normalen leeren Spalten ist)
     if (pEntry->IsEmpty())
         pEntry->SetVisible(sal_False);
 
     if (bWasEditing)
-        ActivateCell(nCellIndex, (sal_uInt16)nColId);
+        ActivateCell(nCellIndex, nColId);
 
     static_cast<OQueryController*>(getDesignView()->getController())->setModified();
 }
@@ -2092,9 +2176,6 @@ void OSelectionBrowseBox::SetCellContents(sal_uInt16 nRow, long nColId, const St
 sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRow, sal_uInt16 nColId) const
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-//  OTableFieldDescRef pEntry = getFields()[nColId-1];
-//  if (!pEntry.isValid())
-//      return DEFAULT_SIZE;
 
     long nRowId = GetRealRow(nRow);
     if (nRowId == BROW_VIS_ROW)
@@ -2113,16 +2194,18 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
     // but the changes aren't permanent ...
 
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    DBG_ASSERT(nColId <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
-    OTableFieldDescRef pEntry = getEntry(nColId-1);
+    USHORT nPos = GetColumnPos(nColId);
+    DBG_ASSERT(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
+    OTableFieldDescRef pEntry = getEntry(nPos-1);
     DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::ColumnResized : keine FieldDescription !");
     static_cast<OQueryController*>(getDesignView()->getController())->setModified();
     EditBrowseBox::ColumnResized(nColId);
 
     if (pEntry.isValid())
     {
+        // create the undo action
         OTabFieldSizedUndoAct* pUndo = new OTabFieldSizedUndoAct(this);
-        pUndo->SetColId(nColId);
+        pUndo->SetColumnPosition( nPos );
         pUndo->SetOriginalWidth(pEntry->GetColWidth());
         getDesignView()->getController()->addUndoActionAndInvalidate(pUndo);
         pEntry->SetColWidth(sal_uInt16(GetColumnWidth(nColId)));
@@ -2133,9 +2216,10 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
 sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    DBG_ASSERT((nColId == 0) || (nColId <= getFields().size()), "OSelectionBrowseBox::GetTotalCellWidth : invalid parameter nColId");
+    USHORT nPos = GetColumnPos(nColId);
+    DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::GetTotalCellWidth : invalid parameter nColId");
 
-    OTableFieldDescRef pEntry = getFields()[nColId-1];
+    OTableFieldDescRef pEntry = getFields()[nPos-1];
     DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::GetTotalCellWidth : invalid FieldDescription !");
 
     long nRow = GetRealRow(nRowId);
@@ -2223,13 +2307,13 @@ void OSelectionBrowseBox::copy()
     }
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow)
+void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String& _rNewValue,long _nRow)
 {
     if(!_rNewValue.Equals(_rOldValue))
     {
         OTabFieldCellModifiedUndoAct* pUndoAct = new OTabFieldCellModifiedUndoAct(this);
         pUndoAct->SetCellIndex(_nRow);
-        pUndoAct->SetColId(GetCurColumnId());
+        pUndoAct->SetColumnPosition(GetColumnPos( GetCurColumnId() ));
         pUndoAct->SetCellContents(_rOldValue);
         getDesignView()->getController()->addUndoActionAndInvalidate(pUndoAct);
     }
@@ -2303,9 +2387,10 @@ OTableFieldDescRef OSelectionBrowseBox::getEntry(OTableFields::size_type _nPos)
 
     OTableFieldDescRef pEntry = aFields[_nPos];
     OSL_ENSURE(pEntry.isValid(),"Invalid entry!");
-    if(pEntry == m_pEmptyEntry)
+    if ( !pEntry.isValid() )
     {
         pEntry = new OTableFieldDesc();
+        pEntry->SetColumnId(GetColumnId(_nPos+1));
         aFields[_nPos] = pEntry;
     }
     return pEntry;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 589d4d20a8b6..061e6990dcf2 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SelectionBrowseBox.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 12:58:56 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,6 +108,7 @@ namespace dbaui
 #define BROW_CRIT5_ROW          10
 #define BROW_CRIT6_ROW          11
 #define BROW_ROW_CNT            12
+
     //==================================================================
     class OQueryDesignView;
     class OSelectionBrowseBox : public ::svt::EditBrowseBox
@@ -141,10 +142,10 @@ namespace dbaui
                                     ~OSelectionBrowseBox();
 
         void                        initialize();
-        OTableFieldDescRef          InsertField( const OJoinExchangeData& jxdSource, long nColId=-1, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
-        OTableFieldDescRef          InsertField( const OTableFieldDescRef& rInfo, long nCol=-1, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
-        void                        InsertColumn( OTableFieldDescRef pEntry, long& nColId );
-        void                        RemoveColumn( sal_uInt16 nColId );
+        OTableFieldDescRef          InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
+        OTableFieldDescRef          InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
+        void                        InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion );
+        void                        RemoveColumn( USHORT _nColumnId );
         void                        DeleteFields( const String& rAliasName );
         // AddGroupBy:: F"ugt ein Feld mit Funktion == Grupierung. Falls das Feld schon vorhanden ist und ein Aggregate Funktion
         // benutzt, wird das Flag nicht gesetzt
@@ -164,8 +165,8 @@ namespace dbaui
         void                        SetColWidth(sal_uInt16 nColId, long lNewWidth);
                                     // beachtet im Gegensatz zum SetColumnWidth der Basisklasse auch eine eventuell aktive Zelle in dieser Spalte
 
-        String                      GetCellContents(sal_uInt16 nCellIndex, long nColId);
-        void                        SetCellContents(sal_uInt16 nCellIndex, long nColId, const String& strNewText);
+        String                      GetCellContents(sal_Int32 nCellIndex, USHORT nColId);
+        void                        SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText);
                                         // Zelleninhalt (als String formatiert) setzen/liefern
         sal_Int32                   GetNoneVisibleRows() const;
         void                        SetNoneVisbleRow(long nRows);
@@ -184,6 +185,8 @@ namespace dbaui
 
         virtual void                GetFocus();
         virtual void                DeactivateCell(sal_Bool bUpdate = sal_True);
+        virtual void                ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); }
+        void                        ColumnMoved( USHORT nColId,BOOL _bCreateUndo);
 
         void                        Fill();
         void                        PreFill();
@@ -242,15 +245,17 @@ namespace dbaui
         virtual sal_uInt32          GetTotalCellWidth(long nRow, sal_uInt16 nColId);
 
         virtual sal_uInt16          GetDefaultColumnWidth(const String& rName) const;
+        // if you want to have an own header ...
+        virtual BrowserHeader*      imp_CreateHeaderBar(BrowseBox* pParent);
 
         void                        stopTimer();
         void                        startTimer();
 
     private:
-        OTableFieldDescRef          FindFirstFreeCol(long & rCol);
+        OTableFieldDescRef          FindFirstFreeCol(USHORT& _rColumnPosition);
             // rCol enthaelt die Nummer (in pOTableFieldDescList) der ersten Spalte, die von sich sagt, dass sie leer ist
             // wenn es keine solche gibt, ist rCol undefiniert und der Rueckgabewert NULL
-        void                        CheckFreeColumns(long& rCol);
+        void                        CheckFreeColumns(USHORT& _rColumnPosition);
             // testet, ob es noch freie Spalten gibt, wenn nicht, wird ein neuer Packen angefuegt
             // rCol enthaelt die Nummer der ersten freien Spalte (in pOTableFieldDescList)
 
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 9c4f1c2315c1..d214287c9151 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldDescription.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-05 06:49:18 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,6 +94,7 @@ OTableFieldDesc::OTableFieldDesc()
              ,m_eFieldType(TAB_NORMAL_FIELD)
              ,m_nIndex(0)
              ,m_eDataType(1000)
+             ,m_nColumnId(-1)
 {
     DBG_CTOR(OTableFieldDesc,NULL);
 }
@@ -114,7 +115,8 @@ OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS)
         m_nIndex(rRS.GetFieldIndex()),
         m_eFunctionType( rRS.GetFunctionType() ),
         m_bGroupBy(rRS.IsGroupBy()),
-        m_vecCriteria( rRS.m_vecCriteria)
+        m_vecCriteria( rRS.m_vecCriteria),
+        m_nColumnId( rRS.m_nColumnId)
 
 {
     DBG_CTOR(OTableFieldDesc,NULL);
@@ -127,6 +129,7 @@ OTableFieldDesc::OTableFieldDesc(const ::rtl::OUString& rT, const ::rtl::OUStrin
              ,m_eOrderDir( ORDER_NONE )
              ,m_eFunctionType( FKT_NONE )
              ,m_bGroupBy(sal_False)
+             ,m_nColumnId(-1)
 {
     DBG_CTOR(OTableFieldDesc,NULL);
     SetField( rF ); SetTable( rT );
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index dc0267f67d32..c1a31fd34f2f 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindow.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:21:01 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,8 +103,8 @@
 #ifndef DBAUI_QUERYCONTROLLER_HXX
 #include "querycontroller.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 89e6778e4b04..26dbac57eb36 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowTitle.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: oj $ $Date: 2002-03-26 07:53:29 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,8 +94,8 @@
 #ifndef DBAUI_TABLECONNECTION_HXX
 #include "TableConnection.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBAUI_QUERYDESIGNVIEW_HXX
 #include "QueryDesignView.hxx"
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 9e2cebb44876..f5b00ebded64 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: query.src,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-16 20:04:01 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,8 +58,8 @@
  *
  *
  ************************************************************************/
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBAUI_QUERY_HRC
 #include "Query.hrc"
@@ -338,6 +338,13 @@ String STR_QUERY_UNDO_TABFIELDDELETE
     Text[ thai ] = "ลบคอลัมน์";
 };
 
+String STR_QUERY_UNDO_TABFIELDMOVED
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Spalte hinzuf�gen : Spalte hinzuf�gen */
+    Text = "Spalte verschieben" ;
+    Text [ ENGLISH ] = "Move column" ;
+};
+
 String STR_QUERY_UNDO_TABFIELDCREATE
 {
     /* ### ACHTUNG: Neuer Text in Resource? Spalte hinzuf�gen : Spalte hinzuf�gen */
@@ -1479,58 +1486,13 @@ ToolBox RID_BRW_QUERYDESIGN_TOOLBOX
         {
             Identifier = ID_BROWSER_UNDO ;
             HelpId = SID_UNDO ;
-            Text = "R�ckg�ngig" ;
-            Text [ ENGLISH ] = "Undo" ;
-            Text[ english_us ] = "Undo";
-            Text[ portuguese ] = "Anular";
-            Text[ russian ] = "��������";
-            Text[ greek ] = "��������";
-            Text[ dutch ] = "Ongedaan";
-            Text[ french ] = "Annuler";
-            Text[ spanish ] = "Deshacer";
-            Text[ italian ] = "Annulla";
-            Text[ danish ] = "Fortryd";
-            Text[ swedish ] = "�ngra";
-            Text[ polish ] = "Cofnij";
-            Text[ portuguese_brazilian ] = "Undo";
-            Text[ japanese ] = "元に戻す";
-            Text[ korean ] = "실행 취소";
-            Text[ chinese_simplified ] = "撤消命令";
-            Text[ chinese_traditional ] = "復原";
-            Text[ turkish ] = "Undo";
-            Text[ arabic ] = "�����";
-            Text[ finnish ] = "Peruuta";
-            Text[ catalan ] = "Desf�s";
-            Text[ thai ] = "เลิกทำ";
+            MID_UNDO
         };
         ToolBoxItem
         {
             Identifier = ID_BROWSER_REDO ;
             HelpId = SID_REDO ;
-            Text = "Wiederherstellen" ;
-            Text [ ENGLISH ] = "Redo" ;
-
-            Text[ english_us ] = "Redo";
-            Text[ portuguese ] = "Restaurar";
-            Text[ russian ] = "������������";
-            Text[ greek ] = "���������";
-            Text[ dutch ] = "Herstellen";
-            Text[ french ] = "Restaurer";
-            Text[ spanish ] = "Restaurar";
-            Text[ italian ] = "Ripristina";
-            Text[ danish ] = "Gendan";
-            Text[ swedish ] = "�terst�ll";
-            Text[ polish ] = "Przywr��";
-            Text[ portuguese_brazilian ] = "Redo";
-            Text[ japanese ] = "やり直し";
-            Text[ korean ] = "복구";
-            Text[ chinese_simplified ] = "恢复撤消命令";
-            Text[ chinese_traditional ] = "恢復撤消指令";
-            Text[ turkish ] = "Redo";
-            Text[ arabic ] = "�����";
-            Text[ finnish ] = "Toista ";
-            Text[ catalan ] = "Ref�s";
-            Text[ thai ] = "ทำซ้ำ";
+            MID_REDO
         };
         ToolBoxItem
         {
@@ -2493,7 +2455,7 @@ String STR_QRY_JOIN_COLUMN_COMPARE
 
 String STR_QRY_LIKE_LEFT_NO_COLUMN
 {
-    Text = "Links eines 'WIE' Ausdrucks darf nur ein Spaltename stehen.";
+    Text = "Links eines 'WIE' Ausdrucks darf nur ein Spaltenname stehen.";
     Text [ ENGLISH ] = "On the left side of a 'LIKE' statement only a column name is allowed.";
     Text[ english_us ] = "You must use a column name before 'LIKE'.";
     Text[ portuguese ] = "On the left side of a 'LIKE' statement only a column name is allowed.";
@@ -2517,8 +2479,7 @@ String STR_QRY_LIKE_LEFT_NO_COLUMN
 
 String STR_QRY_CHECK_CASESENSITIVE
 {
-    Text = "Bitte �berpr�fen Sie die Gross- und Kleinschreibung.";
-    Text [ ENGLISH ] = "Please check if you are using the correct case.";
+    Text = "Die Spalte konnte nicht gefunden werden. Bitte beachten Sie, dass die Datenbank Gross- und Kleinschreibung unterscheidet.";
     Text[ english_us ] = "The column could not be found. Please note that the database is case-sensitive.";
     Text[ portuguese ] = "Please check if you are using the correct case.";
     Text[ russian ] = "Please check if you are using the correct case.";
@@ -2540,4 +2501,3 @@ String STR_QRY_CHECK_CASESENSITIVE
 };
 
 
-
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 6aa928905ac8..9c15d9c066b2 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.79 $
+ *  $Revision: 1.80 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-09 12:39:37 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
@@ -342,31 +342,31 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
             aReturn.bEnabled = m_pSqlIterator != NULL && !m_bDesign;
             break;
         case ID_RELATION_ADD_RELATION:
-            aReturn.bEnabled = m_bEditable && m_bDesign && m_vTableData.size() > 1;
+            aReturn.bEnabled = isEditable() && m_bDesign && m_vTableData.size() > 1;
             break;
         case ID_BROWSER_SAVEASDOC:
             aReturn.bEnabled = !m_bCreateView && (!m_bDesign || !(m_vTableFieldDesc.empty() || m_vTableData.empty()));
             break;
         case ID_BROWSER_SAVEDOC:
-            aReturn.bEnabled = m_bModified && (!m_bDesign || !(m_vTableFieldDesc.empty() || m_vTableData.empty()));
+            aReturn.bEnabled = isModified() && (!m_bDesign || !(m_vTableFieldDesc.empty() || m_vTableData.empty()));
             break;
         case SID_PRINTDOCDIRECT:
             break;
         case ID_BROWSER_CUT:
-            aReturn.bEnabled = m_bEditable && getContainer() && getContainer()->isCutAllowed();
+            aReturn.bEnabled = isEditable() && getContainer() && getContainer()->isCutAllowed();
             break;
         case ID_BROWSER_COPY:
             aReturn.bEnabled = getContainer() && getContainer()->isCopyAllowed();
             break;
         case ID_BROWSER_PASTE:
-            aReturn.bEnabled = m_bEditable && getContainer() && getContainer()->isPasteAllowed();
+            aReturn.bEnabled = isEditable() && getContainer() && getContainer()->isPasteAllowed();
             break;
         case ID_BROWSER_SQL:
             aReturn.bEnabled = m_bEsacpeProcessing && m_pSqlIterator;
             aReturn.aState = ::cppu::bool2any(m_bDesign);
             break;
         case ID_BROWSER_CLEAR_QUERY:
-            aReturn.bEnabled = m_bEditable && (m_sStatement.getLength() || !m_vTableData.empty());
+            aReturn.bEnabled = isEditable() && (m_sStatement.getLength() || !m_vTableData.empty());
             break;
         case ID_BROWSER_QUERY_VIEW_FUNCTIONS:
         case ID_BROWSER_QUERY_VIEW_TABLES:
@@ -375,7 +375,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
             aReturn.bEnabled = m_bDesign;
             break;
         case ID_BROWSER_QUERY_DISTINCT_VALUES:
-            aReturn.bEnabled = m_bDesign && m_bEditable;
+            aReturn.bEnabled = m_bDesign && isEditable();
             aReturn.aState = ::cppu::bool2any(m_bDistinct);
             break;
         case ID_BROWSER_QUERY_EXECUTE:
@@ -504,9 +504,9 @@ void OQueryController::Execute(sal_uInt16 _nId)
             break;
         case ID_BROWSER_CLEAR_QUERY:
             {
-                m_aUndoManager.EnterListAction( String( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), String() );
+                getUndoMgr()->EnterListAction( String( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), String() );
                 getContainer()->clear();
-                m_aUndoManager.LeaveListAction();
+                getUndoMgr()->LeaveListAction();
 
                 m_sStatement = ::rtl::OUString();
                 if(m_bDesign)
@@ -1061,7 +1061,7 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement
 // -----------------------------------------------------------------------------
 void OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
 {
-    OSL_ENSURE(m_bEditable,"Slot ID_BROWSER_SAVEDOC should not be enabled!");
+    OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!");
     if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)),getORB()))
     {
         String aMessage(ModuleRes(STR_DATASOURCE_DELETED));
@@ -1283,7 +1283,7 @@ void OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
 short OQueryController::saveModified()
 {
     short nRet = RET_YES;
-    if(isConnected() && m_bModified && (!m_bDesign || !(m_vTableFieldDesc.empty() || m_vTableData.empty())))
+    if(isConnected() && isModified() && (!m_bDesign || !(m_vTableFieldDesc.empty() || m_vTableData.empty())))
     {
         QueryBox aQry(getView(), ModuleRes(m_bCreateView ? QUERY_VIEW_DESIGN_SAVEMODIFIED : QUERY_DESIGN_SAVEMODIFIED));
         nRet = aQry.Execute();
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index ad3393d13c83..334291f30175 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querydlg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 07:45:42 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef DBAUI_QUERYDLG_HXX
 #include "querydlg.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBAUI_QUERYDLG_HRC
 #include "querydlg.hrc"
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 562c63fc6649..3670fc63f5a5 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querydlg.src,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-10 20:14:05 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,8 +58,8 @@
  *
  *
  ************************************************************************/
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef DBAUI_QUERYDLG_HRC
 #include "querydlg.hrc"
diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx
index 4b1f0b2a1d2e..260e7e1e6c2e 100644
--- a/dbaccess/source/ui/querydesign/queryview.cxx
+++ b/dbaccess/source/ui/querydesign/queryview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryview.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 08:01:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_QRY_HRC_
+#include "dbu_qry.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 4bc31bb6a2d5..7c21f391cb49 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationController.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-02 06:56:00 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:52:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,9 +64,10 @@
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_REL_HRC_
+#include "dbu_rel.hrc"
 #endif
+
 #ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
 #endif
@@ -263,11 +264,11 @@ FeatureState ORelationController::GetState(sal_uInt16 _nId) const
     switch (_nId)
     {
         case ID_RELATION_ADD_RELATION:
-            aReturn.bEnabled = m_vTableData.size() > 1 && isConnected() && m_bEditable;
+            aReturn.bEnabled = m_vTableData.size() > 1 && isConnected() && isEditable();
             aReturn.aState = ::cppu::bool2any(sal_False);
             break;
         case ID_BROWSER_SAVEDOC:
-            aReturn.bEnabled = haveDataSource() && m_bModified;
+            aReturn.bEnabled = haveDataSource() && isModified();
             break;
         default:
             aReturn = OJoinController::GetState(_nId);
@@ -282,7 +283,7 @@ void ORelationController::Execute(sal_uInt16 _nId)
     {
         case ID_BROWSER_SAVEDOC:
             {
-                OSL_ENSURE(m_bEditable,"Slot ID_BROWSER_SAVEDOC should not be enabled!");
+                OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!");
                 if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)),getORB()))
                 {
                     String aMessage(ModuleRes(STR_DATASOURCE_DELETED));
@@ -360,7 +361,7 @@ void SAL_CALL ORelationController::initialize( const Sequence< Any >& aArguments
 
     if ( !ensureConnected( sal_False ) )
     {
-        m_bEditable             = sal_False;
+        setEditable(sal_False);
         m_bRelationsPossible    = sal_False;
         {
             {
@@ -374,7 +375,7 @@ void SAL_CALL ORelationController::initialize( const Sequence< Any >& aArguments
     else if(!getMetaData()->supportsIntegrityEnhancementFacility())
     {// check if this database supports relations
 
-        m_bEditable             = sal_False;
+        setEditable(sal_False);
         m_bRelationsPossible    = sal_False;
         {
             OSQLMessageBox aDlg(getView(),ModuleRes(STR_RELATIONDESIGN),ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE));
@@ -433,7 +434,7 @@ sal_Bool ORelationController::Construct(Window* pParent)
 short ORelationController::saveModified()
 {
     short nSaved = RET_YES;
-    if(haveDataSource() && m_bModified)
+    if(haveDataSource() && isModified())
     {
         QueryBox aQry(getView(), ModuleRes(RELATION_DESIGN_SAVEMODIFIED));
         nSaved = aQry.Execute();
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 25f8dcc0a79c..a07f322554d8 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationDesignView.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2002-05-02 07:51:26 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:52:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,8 +85,8 @@
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_REL_HRC_
+#include "dbu_rel.hrc"
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 82a1c61b2a42..18840bd49057 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationTableView.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-27 08:23:50 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:52:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,8 +133,8 @@
 #ifndef _DBAUI_SQLMESSAGE_HXX_
 #include "sqlmessage.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_REL_HRC_
+#include "dbu_rel.hrc"
 #endif
 #ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index b443228c4cd0..f612115787d6 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: relation.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: rt $ $Date: 2002-06-10 15:12:05 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:52:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,8 +58,8 @@
  *
  *
  ************************************************************************/
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_REL_HRC_
+#include "dbu_rel.hrc"
 #endif
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
@@ -196,58 +196,13 @@ ToolBox RID_BRW_REALTIONDESIGN_TOOLBOX
         {
             Identifier = ID_BROWSER_UNDO ;
             HelpId = SID_UNDO ;
-            Text = "R�ckg�ngig" ;
-            Text [ ENGLISH ] = "Undo" ;
-            Text[ english_us ] = "Undo";
-            Text[ portuguese ] = "Anular";
-            Text[ russian ] = "��������";
-            Text[ greek ] = "��������";
-            Text[ dutch ] = "Ongedaan";
-            Text[ french ] = "Annuler";
-            Text[ spanish ] = "Deshacer";
-            Text[ italian ] = "Annulla";
-            Text[ danish ] = "Undo";
-            Text[ swedish ] = "�ngra";
-            Text[ polish ] = "Cofnij";
-            Text[ portuguese_brazilian ] = "Undo";
-            Text[ japanese ] = "元に戻す";
-            Text[ korean ] = "실행취소";
-            Text[ chinese_simplified ] = "撤消命令";
-            Text[ chinese_traditional ] = "復原";
-            Text[ turkish ] = "Undo";
-            Text[ arabic ] = "�����";
-            Text[ catalan ] = "Desf�s";
-            Text[ finnish ] = "Peruuta";
-            Text[ thai ] = "เลิกทำ";
+            MID_UNDO
         };
         ToolBoxItem
         {
             Identifier = ID_BROWSER_REDO ;
             HelpId = SID_REDO ;
-            Text = "Wiederherstellen" ;
-            Text [ ENGLISH ] = "Redo" ;
-
-            Text[ english_us ] = "Redo";
-            Text[ portuguese ] = "Restaurar";
-            Text[ russian ] = "������������";
-            Text[ greek ] = "���������";
-            Text[ dutch ] = "Herstellen";
-            Text[ french ] = "Restaurer";
-            Text[ spanish ] = "Restaurar";
-            Text[ italian ] = "Ripristina";
-            Text[ danish ] = "Redo";
-            Text[ swedish ] = "�terst�ll";
-            Text[ polish ] = "Przywr��";
-            Text[ portuguese_brazilian ] = "Redo";
-            Text[ japanese ] = "やり直し";
-            Text[ korean ] = "복구";
-            Text[ chinese_simplified ] = "恢复撤消命令";
-            Text[ chinese_traditional ] = "恢復撤消指令";
-            Text[ turkish ] = "Redo";
-            Text[ arabic ] = "�����";
-            Text[ catalan ] = "Ref�s";
-            Text[ finnish ] = "Toista ";
-            Text[ thai ] = "ทำซ้ำ";
+            MID_REDO
         };
         ToolBoxItem
         {
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 83e80a28bd11..c8b3fd6615a3 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescriptions.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 07:02:20 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index bea6af1961c1..9c818df50d6a 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TEditControl.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-07 08:39:43 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,8 +85,8 @@
 #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index df05d15c7789..10a4ca2849c2 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.cxx,v $
  *
- *  $Revision: 1.77 $
+ *  $Revision: 1.78 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 09:46:49 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
@@ -259,8 +259,6 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMulti
 
 // -----------------------------------------------------------------------------
 OTableController::OTableController(const Reference< XMultiServiceFactory >& _rM) : OTableController_BASE(_rM)
-    ,m_bEditable(sal_True)
-    ,m_bModified(sal_False)
     ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
     ,m_bNew(sal_True)
     ,m_pTypeInfo(NULL)
@@ -323,11 +321,11 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
             aReturn.aState = ::cppu::bool2any( isConnected() );
             break;
         case ID_BROWSER_EDITDOC:
-            aReturn.aState = ::cppu::bool2any(m_bEditable);
-            aReturn.bEnabled = m_bNew || m_bEditable || isAddAllowed() || isDropAllowed() || isAlterAllowed();
+            aReturn.aState = ::cppu::bool2any(isEditable());
+            aReturn.bEnabled = m_bNew || isEditable() || isAddAllowed() || isDropAllowed() || isAlterAllowed();
             break;
         case ID_BROWSER_SAVEDOC:
-            aReturn.bEnabled = m_bModified;
+            aReturn.bEnabled = isModified();
             if ( aReturn.bEnabled )
             {
                 ::std::vector<OTableRow*>::const_iterator aIter = ::std::find_if(m_vRowList.begin(),m_vRowList.end(),::std::mem_fun(&OTableRow::isValid));
@@ -344,23 +342,17 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
             break;
 
         case ID_BROWSER_CUT:
-            aReturn.bEnabled = m_bEditable && m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed();
+            aReturn.bEnabled = isEditable() && m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed();
             break;
         case ID_BROWSER_COPY:
             aReturn.bEnabled = m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCopyAllowed();
             break;
         case ID_BROWSER_PASTE:
-            aReturn.bEnabled = m_bEditable && m_bFrameUiActive;
-            break;
-        case ID_BROWSER_UNDO:
-            aReturn.bEnabled = m_bEditable && m_aUndoManager.GetUndoActionCount() != 0;
-            break;
-        case ID_BROWSER_REDO:
-            aReturn.bEnabled = m_bEditable && m_aUndoManager.GetRedoActionCount() != 0;
+            aReturn.bEnabled = isEditable() && m_bFrameUiActive;
             break;
         case SID_INDEXDESIGN:
             aReturn.bEnabled =
-                (   (   ((!m_bNew && m_bModified) || m_bModified)
+                (   (   ((!m_bNew && isModified()) || isModified())
                     ||  Reference< XIndexesSupplier >(m_xTable, UNO_QUERY).is()
                     )
                 &&  isConnected()
@@ -371,6 +363,8 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
                 aReturn.bEnabled = aIter != m_vRowList.end();
             }
             break;
+        default:
+            aReturn = OTableController_BASE::GetState(_nId);
     }
     return aReturn;
 }
@@ -379,17 +373,13 @@ void OTableController::Execute(sal_uInt16 _nId)
 {
     switch(_nId)
     {
-        case SID_CLOSEDOC:
-            closeTask();
-            return;
-            break;
         case ID_TABLE_DESIGN_NO_CONNECTION:
             if (!isConnected())
                 reconnect( sal_False );
             break;
         case ID_BROWSER_EDITDOC:
-            m_bEditable = !m_bEditable;
-            static_cast<OTableDesignView*>(getView())->setReadOnly(!m_bEditable);
+            setEditable(!isEditable());
+            static_cast<OTableDesignView*>(getView())->setReadOnly(!isEditable());
             InvalidateFeature(ID_BROWSER_PASTE);
             InvalidateFeature(ID_BROWSER_CLEAR_QUERY);
             break;
@@ -409,17 +399,11 @@ void OTableController::Execute(sal_uInt16 _nId)
         case ID_BROWSER_PASTE:
             static_cast<OTableDesignView*>(getView())->paste();
             break;
-        case ID_BROWSER_UNDO:
-            m_aUndoManager.Undo();
-            InvalidateFeature(ID_BROWSER_REDO);
-            break;
-        case ID_BROWSER_REDO:
-            m_aUndoManager.Redo();
-            InvalidateFeature(ID_BROWSER_UNDO);
-            break;
         case SID_INDEXDESIGN:
             doEditIndexes();
             break;
+        default:
+            OTableController_BASE::Execute(_nId);
     }
     InvalidateFeature(_nId);
 }
@@ -566,7 +550,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
     }
     catch(const ElementExistException& )
     {
-        String sText( ModuleRes(STR_OBJECT_ALREADY_EXISTS)) ;
+        String sText( ModuleRes(STR_OBJECT_ALREADY_EXISTS));
         sText.SearchAndReplaceAscii( "#" , m_sName);
         OSQLMessageBox aDlg(getView(), String(ModuleRes(STR_OBJECT_ALREADY_EXSISTS)), sText, WB_OK, OSQLMessageBox::Error);
 
@@ -597,7 +581,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
 void OTableController::doEditIndexes()
 {
     // table needs to be saved before editing indexes
-    if (m_bNew || m_bModified)
+    if (m_bNew || isModified())
     {
         QueryBox aAsk(getView(), ModuleRes(QUERY_SAVE_TABLE_EDIT_INDEXES));
         if (RET_YES != aAsk.Execute())
@@ -606,7 +590,7 @@ void OTableController::doEditIndexes()
         if (!doSaveDoc(sal_False))
             return;
 
-        OSL_ENSURE(!m_bNew && !m_bModified, "OTableController::doEditIndexes: what the hell did doSaveDoc do?");
+        OSL_ENSURE(!m_bNew && !isModified(), "OTableController::doEditIndexes: what the hell did doSaveDoc do?");
     }
 
     Reference< XNameAccess > xIndexes;          // will be the keys of the table
@@ -831,9 +815,7 @@ SfxUndoManager* OTableController::getUndoMgr()
 // -----------------------------------------------------------------------------
 void OTableController::setModified(sal_Bool _bModified)
 {
-    m_bModified = _bModified;
-    InvalidateFeature(ID_BROWSER_SAVEDOC);
-    InvalidateFeature(ID_BROWSER_SAVEASDOC);
+    OSingleDocumentController::setModified(_bModified);
     InvalidateFeature(SID_INDEXDESIGN);
 }
 // -----------------------------------------------------------------------------
@@ -1591,8 +1573,8 @@ void OTableController::assignTable()
 
                 // check if we set the table editable
                 Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY);
-                m_bEditable = isAlterAllowed() || isDropAllowed() || isAddAllowed();
-                if(!m_bEditable)
+                setEditable( isAlterAllowed() || isDropAllowed() || isAddAllowed() );
+                if(!isEditable())
                 {
                     ::std::vector<OTableRow*>::iterator aIter = m_vRowList.begin();
                     for(; aIter != m_vRowList.end(); ++aIter)
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 2ab3ed85f3c3..f2b89a81d62a 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDesignControl.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-14 07:56:01 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef DBAUI_TABLEDESIGNCONTROL_HXX
 #include "TableDesignControl.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 29577f4495ff..7883118753a2 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldDescWin.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-05 13:22:53 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef DBAUI_FIELDDESCRIPTIONS_HXX
 #include "FieldDescriptions.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index a35f6efa87ec..64bd3934d441 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableUndo.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-03 12:54:05 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef DBAUI_TABLEEDITORCONTROL_HXX
 #include "TEditControl.hxx"
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index cd1044ea5e27..6ec10ab880a7 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.src,v $
  *
- *  $Revision: 1.65 $
+ *  $Revision: 1.66 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-16 20:04:08 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_TBL_HRC_
+#include "dbu_tbl.hrc"
 #endif
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
@@ -1024,58 +1024,13 @@ ToolBox RID_BRW_TABLEDESIGN_TOOLBOX
         {
             Identifier = ID_BROWSER_UNDO ;
             HelpId = SID_UNDO ;
-            Text = "R�ckg�ngig" ;
-            Text [ ENGLISH ] = "Undo" ;
-            Text[ english_us ] = "Undo";
-            Text[ portuguese ] = "Anular";
-            Text[ russian ] = "��������";
-            Text[ greek ] = "��������";
-            Text[ dutch ] = "Ongedaan";
-            Text[ french ] = "Annuler";
-            Text[ spanish ] = "Deshacer";
-            Text[ italian ] = "Annulla";
-            Text[ danish ] = "Fortryd";
-            Text[ swedish ] = "�ngra";
-            Text[ polish ] = "Cofnij";
-            Text[ portuguese_brazilian ] = "Undo";
-            Text[ japanese ] = "元に戻す";
-            Text[ korean ] = "실행 취소";
-            Text[ chinese_simplified ] = "撤消命令";
-            Text[ chinese_traditional ] = "復原";
-            Text[ turkish ] = "Undo";
-            Text[ arabic ] = "�����";
-            Text[ catalan ] = "Desf�s";
-            Text[ finnish ] = "Peruuta";
-            Text[ thai ] = "เลิกทำ";
+            MID_UNDO
         };
         ToolBoxItem
         {
             Identifier = ID_BROWSER_REDO ;
             HelpId = SID_REDO ;
-            Text = "Wiederherstellen" ;
-            Text [ ENGLISH ] = "Redo" ;
-
-            Text[ english_us ] = "Redo";
-            Text[ portuguese ] = "Restaurar";
-            Text[ russian ] = "������������";
-            Text[ greek ] = "���������";
-            Text[ dutch ] = "Herstellen";
-            Text[ french ] = "Restaurer";
-            Text[ spanish ] = "Restaurar";
-            Text[ italian ] = "Ripristina";
-            Text[ danish ] = "Gendan";
-            Text[ swedish ] = "�terst�ll";
-            Text[ polish ] = "Przywr��";
-            Text[ portuguese_brazilian ] = "Redo";
-            Text[ japanese ] = "やり直し";
-            Text[ korean ] = "복구";
-            Text[ chinese_simplified ] = "恢复撤消命令";
-            Text[ chinese_traditional ] = "恢復撤消指令";
-            Text[ turkish ] = "Redo";
-            Text[ arabic ] = "�����";
-            Text[ catalan ] = "Ref�s";
-            Text[ finnish ] = "Toista ";
-            Text[ thai ] = "ทำซ้ำ";
+            MID_REDO
         };
         ToolBoxItem
         {
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index a2b7f676e915..9bfd07870457 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinteraction.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-17 09:09:44 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:54:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,8 +98,8 @@
 #ifndef _SVTOOLS_LOGINDLG_HXX_
 #include <svtools/logindlg.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_UNO_HRC_
+#include "dbu_uno.hrc"
 #endif
 #ifndef _DBAUI_PARAMDIALOG_HXX_
 #include "paramdialog.hxx"
@@ -440,6 +440,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.7  2001/05/17 09:09:44  fs
+ *  #86509# acquire the solar mutex in all implHandle methods (needed for opening the dialogs)
+ *
  *  Revision 1.6  2001/01/05 12:16:07  fs
  *  adjusted the implementation name
  *
diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src
index 9679fd61092c..23f49ad4ff06 100644
--- a/dbaccess/source/ui/uno/dbinteraction.src
+++ b/dbaccess/source/ui/uno/dbinteraction.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinteraction.src,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: vg $ $Date: 2001-11-16 22:33:27 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:54:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_UNO_HRC_
+#include "dbu_uno.hrc"
 #endif
 
 String STR_REMEMBERPASSWORD_SESSION
@@ -123,6 +123,9 @@ String STR_REMEMBERPASSWORD_PERSISTENT
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.16  2001/11/16 22:33:27  vg
+ *  Merge SRC638: 16.11.01 - 22:34:06
+ *
  *  Revision 1.15  2001/09/25 20:18:57  kz
  *  Merge SRC638: 25.09.01 - 22:18:35
  *