#99473# change string resource files

15 files changed, 124 insertions, 272 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 88ebc5fdbc15..273f52f0ba51 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwctrlr.cxx,v $
  *
- *  $Revision: 1.68 $
+ *  $Revision: 1.69 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 12:59:36 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -186,8 +186,8 @@
 #ifndef _CPPUHELPER_IMPLBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef _SFX_HRC
 #include <sfx2/sfx.hrc>
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index c64694d2d356..1364ece9b838 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brwview.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-11 10:01:56 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_
 #include <com/sun/star/form/XLoadable.hpp>
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 1169b4429d03..b6ebb2df2bd2 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsEntriesNoExp.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 07:37:58 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,8 +77,8 @@
 #ifndef DBAUI_DBTREELISTBOX_HXX
 #include "dbtreelistbox.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef DBAUI_DBTREEMODEL_HXX
 #include "dbtreemodel.hxx"
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 4eb18f725644..519022424548 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsbrowserDnD.cxx,v $
  *
- *  $Revision: 1.52 $
+ *  $Revision: 1.53 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-11 06:53:41 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,8 +117,8 @@
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
@@ -1388,6 +1388,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.52  2002/07/11 06:53:41  oj
+ *  #95978# check if name for table is valid
+ *
  *  Revision 1.51  2002/07/09 12:46:11  oj
  *  #99921# check if datasource allows to check names
  *
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index d6bb03ba3325..39efab83d7e2 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formadapter.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-24 16:21:29 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,8 +80,8 @@
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 20084bdb89c3..ed0afe9d6efa 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: genericcontroller.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-22 12:57:58 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -374,6 +374,8 @@ sal_Bool OGenericUnoController::ImplInvalidateTBItem(sal_uInt16 nId, const Featu
         case TypeClass_STRING:
             if (pTB->GetItemWindow(nId))
                 pTB->GetItemWindow(nId)->SetText(::comphelper::getString(rState.aState));
+            else
+                pTB->SetQuickHelpText(nId,::comphelper::getString(rState.aState));
             break;
 
         case TypeClass_VOID:
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 1af06018492e..ef8c213231c9 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbabrw.src,v $
  *
- *  $Revision: 1.80 $
+ *  $Revision: 1.81 $
  *
- *  last change: $Author: obo $ $Date: 2002-08-04 20:13:14 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index ede378f054f1..8a48399b4b91 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.cxx,v $
  *
- *  $Revision: 1.57 $
+ *  $Revision: 1.58 $
  *
- *  last change: $Author: oj $ $Date: 2002-04-23 07:27:36 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -227,8 +227,8 @@
 #ifndef _SVX_DBEXCH_HRC
 #include <svx/dbexch.hrc>
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index a45346ff7062..125eb119f2e7 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.src,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-16 20:03:57 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,9 +58,10 @@
  *
  *
  ************************************************************************/
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
+
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 60d0a1277d47..68d676c8f44f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodatbr.cxx,v $
  *
- *  $Revision: 1.138 $
+ *  $Revision: 1.139 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-25 07:04:55 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:32:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -219,8 +219,8 @@
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_BRW_HRC_
+#include "dbu_brw.hrc"
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 1b204cc01c2e..84b1ddcd87ec 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GeneralUndo.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2001-01-09 16:01:33 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:28:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@ namespace dbaui
     public:
         OCommentUndoAction(USHORT nCommentID) { m_strComment = String(ModuleRes(nCommentID)); }
 
-        String  getComment() const { return m_strComment; }
+        virtual UniString   GetComment() const { return m_strComment; }
     };
 }
 #endif // DBAUI_GENERALUNDO_HXX
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 79d42f9f9a91..34baefc47b3a 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinExchange.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-21 06:57:25 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:28:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,9 +97,10 @@ namespace dbaui
         OJoinExchangeData           m_jxdSourceDescription;
         IDragTransferableListener*  m_pDragListener;
 
+        virtual ~OJoinExchObj();
     public:
         OJoinExchObj(const OJoinExchangeData& jxdSource,sal_Bool _bFirstEntry=sal_False);
-        ~OJoinExchObj();
+
 
         // XInterface
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 9f424b7810ec..d94e608dac42 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableFieldDescription.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-05 06:49:45 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:28:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,7 @@ namespace dbaui
         EOrderDir                   m_eOrderDir;
         sal_Int32                   m_nIndex;
         sal_Int32                   m_nColWidth;
+        sal_uInt16                  m_nColumnId;
         sal_Bool                    m_bGroupBy;
         sal_Bool                    m_bVisible;
 
@@ -139,6 +140,8 @@ namespace dbaui
         void                    SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; }
         void                    SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; }
         void                    SetFunctionType( EFunctionType eTyp )   { m_eFunctionType = eTyp; }
+        void                    SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; }
+
 
         ::rtl::OUString         GetField()          const { return m_aFieldName;}
         ::rtl::OUString         GetFieldAlias()     const { return m_aFieldAlias;}
@@ -154,6 +157,7 @@ namespace dbaui
         sal_Int32               GetFieldIndex()     const { return m_nIndex; }
         Window*                 GetTabWindow()      const { return m_pTabWindow;}
         EFunctionType           GetFunctionType()   const { return m_eFunctionType; }
+        sal_uInt16              GetColumnId()       const { return m_nColumnId;}
 
         sal_Bool                HasCriteria()       const
         {
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 872fbbb373b8..a236e91f4cf1 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_resource.hrc,v $
  *
- *  $Revision: 1.78 $
+ *  $Revision: 1.79 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 07:07:07 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:28:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,38 @@
 #define RID_WARN_START                  RID_DBACCESS_START
 #define RID_CONTROL_START               RID_DBACCESS_START
 
+// new defines to make the strings folder specific
+#define RID_STR_BRW_START               RID_DBACCESS_START
+#define RID_STR_BRW_END                 RID_STR_BRW_START       + 40    //   0 -  39
+
+#define RID_STR_CONTROL_START           RID_STR_BRW_END
+#define RID_STR_CONTROL_END             RID_STR_CONTROL_START   + 30    //  40 -  69
+
+#define RID_STR_DLG_START               RID_STR_CONTROL_END
+#define RID_STR_DLG_END                 RID_STR_DLG_START       + 80    //  70 - 149
+
+#define RID_STR_MISC_START              RID_STR_DLG_END
+#define RID_STR_MISC_END                RID_STR_MISC_START      + 20    // 150 - 169
+
+#define RID_STR_QRY_START               RID_STR_MISC_END
+#define RID_STR_QRY_END                 RID_STR_QRY_START       + 80    // 170 - 249
+
+#define RID_STR_TBL_START               RID_STR_QRY_END
+#define RID_STR_TBL_END                 RID_STR_TBL_START       + 80    // 250 - 329
+
+#define RID_STR_REL_START               RID_STR_TBL_END
+#define RID_STR_REL_END                 RID_STR_REL_START       + 10    // 330 - 349
+
+#define RID_STR_UNO_START               RID_STR_REL_END
+#define RID_STR_UNO_END                 RID_STR_UNO_START       +  5    // 350 - 354
+
+#define RID_STR_GEN_START               RID_STR_UNO_END
+#define RID_STR_GEN_END                 RID_STR_GEN_START       + 35    // 355 - 389
+
+#if RID_STR_GEN_END > RID_DBACCESS_END
+#error Resource-Id Ueberlauf in #file, #line
+#endif
+
 //========================================================================
 // dialog ids
 
@@ -294,226 +326,32 @@
 
 //========================================================================
 // strings
-
-#define STR_COULDNOTCREATE_DRIVERMANAGER    RID_STRING_START +  0
-#define STR_NOREGISTEREDDRIVER              RID_STRING_START +  1
-#define STR_COULDNOTCONNECT                 RID_STRING_START +  2
-#define STR_COULDNOTCONNECT_PLEASECHECK     RID_STRING_START +  3
-#define STR_NOTABLEINFO                     RID_STRING_START +  4
-#define STR_GENERAL_SDB_ERROR               RID_STRING_START +  5
-#define STR_ENTER_CONNECTION_PASSWORD       RID_STRING_START +  6
-#define STR_DATASOURCE_DEFAULTNAME          RID_STRING_START +  7
-#define STR_TBL_TITLE                       RID_STRING_START +  8
-#define STR_QRY_TITLE                       RID_STRING_START +  9
-#define RID_STR_CONNECTION_LOST             RID_STRING_START + 10
-#define RID_STR_LOADING_DATASOURCE          RID_STRING_START + 11
-#define RID_STR_SAVE_CURRENT_RECORD         RID_STRING_START + 12
-#define RID_STR_UNDO_MODIFY_RECORD          RID_STRING_START + 13
-#define SBA_BROWSER_SETTING_ORDER           RID_STRING_START + 14
-#define SBA_BROWSER_SETTING_FILTER          RID_STRING_START + 15
-#define RID_STR_DATABROWSER_FILTERED        RID_STRING_START + 16
-#define STR_REMEMBERPASSWORD_SESSION        RID_STRING_START + 17
-#define STR_REMEMBERPASSWORD_PERSISTENT     RID_STRING_START + 18
-#define STR_ERR_EMPTY_DSN_NAME              RID_STRING_START + 19
-#define STR_QRY_FUNCTIONS                   RID_STRING_START + 20
-#define STR_QRY_SORTTEXT                    RID_STRING_START + 21
-#define STR_QUERY_UNDO_MOVETABWIN           RID_STRING_START + 22
-#define STR_QUERY_UNDO_SIZETABWIN           RID_STRING_START + 23
-#define STR_QUERY_UNDO_INSERTCONNECTION     RID_STRING_START + 24
-#define STR_QUERY_UNDO_REMOVECONNECTION     RID_STRING_START + 25
-#define STR_QUERY_UNDO_TABWINSHOW           RID_STRING_START + 26
-#define STR_QUERY_UNDO_TABWINDELETE         RID_STRING_START + 27
-#define STR_QUERY_UNDO_MODIFY_CELL          RID_STRING_START + 28
-#define STR_QUERY_UNDO_SIZE_COLUMN          RID_STRING_START + 29
-#define STR_QUERY_UNDO_TABFIELDDELETE       RID_STRING_START + 30
-#define STR_QUERY_UNDO_TABFIELDCREATE       RID_STRING_START + 31
-#define STR_QUERY_UNDO_MODIFYSQLEDIT        RID_STRING_START + 32
-#define RID_STR_TABLE_DOESNT_EXIST          RID_STRING_START + 33
-#define RID_STR_FIELD_DOESNT_EXIST          RID_STRING_START + 34
-#define RID_STR_TOMUCHTABLES                RID_STRING_START + 35
-#define RID_STR_QUERIES_CONTAINER           RID_STRING_START + 36
-#define RID_STR_TABLES_CONTAINER            RID_STRING_START + 37
-#define STR_OBJECT_ALREADY_EXSISTS          RID_STRING_START + 38
-
-#define STR_QUERY_INNER_JOIN                RID_STRING_START + 39
-#define STR_QUERY_LEFTRIGHT_JOIN            RID_STRING_START + 40
-#define STR_QUERY_FULL_JOIN                 RID_STRING_START + 41
-
-#define STR_QUERY_SORTTEXT                  RID_STRING_START + 42
-#define STR_QUERY_FUNCTIONS                 RID_STRING_START + 43
-#define STR_QUERY_NOTABLE                   RID_STRING_START + 44
-#define STR_QRY_ORDERBY_UNRELATED           RID_STRING_START + 45
-#define STR_QUERY_HANDLETEXT                RID_STRING_START + 46
-#define STR_QUERY_FALSE                     RID_STRING_START + 47
-#define STR_QUERY_TRUE                      RID_STRING_START + 48
-
-#define STR_ALL_TABLES                      RID_STRING_START + 49
-#define STR_ALL_VIEWS                       RID_STRING_START + 50
-#define STR_ALL_TABLES_AND_VIEWS            RID_STRING_START + 51
-
-#define STR_TABLEDESIGN_DBFIELDTYPES        RID_STRING_START + 52
-#define STR_TABLEDESIGN_UNDO_PRIMKEY        RID_STRING_START + 53
-#define STR_VALUE_YES                       RID_STRING_START + 54
-#define STR_VALUE_NO                        RID_STRING_START + 55
-#define STR_VALUE_ASC                       RID_STRING_START + 56
-#define STR_VALUE_DESC                      RID_STRING_START + 57
-#define STR_VALUE_NONE                      RID_STRING_START + 58
-#define STR_TAB_FIELD_NAME                  RID_STRING_START + 59
-#define STR_TAB_FIELD_DATATYPE              RID_STRING_START + 60
-#define STR_TAB_FIELD_LENGTH                RID_STRING_START + 61
-#define STR_TAB_FIELD_DESCR                 RID_STRING_START + 62
-#define STR_TAB_FIELD_NULLABLE              RID_STRING_START + 63
-#define STR_FIELD_AUTOINCREMENT             RID_STRING_START + 64
-#define STR_TAB_PROPERTIES                  RID_STRING_START + 65
-#define STR_TABPAGE_GENERAL                 RID_STRING_START + 66
-#define STR_TAB_TABLE_DESCRIPTION           RID_STRING_START + 67
-#define STR_TAB_TABLE_PROPERTIES            RID_STRING_START + 68
-#define STR_TABED_UNDO_TYPE_CHANGED         RID_STRING_START + 69
-#define STR_TABED_UNDO_ROWDELETED           RID_STRING_START + 70
-#define STR_TABED_UNDO_ROWINSERTED          RID_STRING_START + 71
-#define STR_TABED_UNDO_NEWROWINSERTED       RID_STRING_START + 72
-#define STR_TABED_UNDO_PRIMKEY              RID_STRING_START + 73
-#define STR_HELP_AUTOINCREMENT              RID_STRING_START + 74
-#define STR_HELP_FORMAT_BUTTON              RID_STRING_START + 75
-#define STR_HELP_FORMAT_CODE                RID_STRING_START + 76
-#define STR_HELP_SCALE                      RID_STRING_START + 77
-#define STR_HELP_LENGTH                     RID_STRING_START + 78
-#define STR_HELP_NUMERIC_TYPE               RID_STRING_START + 79
-#define STR_HELP_TEXT_LENGTH                RID_STRING_START + 80
-#define STR_HELP_FIELD_REQUIRED             RID_STRING_START + 81
-#define STR_HELP_DEFAULT_VALUE              RID_STRING_START + 82
-#define STR_HELP_BOOL_DEFAULT               RID_STRING_START + 83
-#define STR_FORMAT                          RID_STRING_START + 84
-#define STR_SCALE                           RID_STRING_START + 85
-#define STR_LENGTH                          RID_STRING_START + 86
-#define STR_NUMERIC_TYPE                    RID_STRING_START + 87
-#define STR_TEXT_LENGTH                     RID_STRING_START + 88
-#define STR_FIELD_REQUIRED                  RID_STRING_START + 89
-#define STR_DEFAULT_VALUE                   RID_STRING_START + 90
-#define STR_TABED_UNDO_CELLMODIFIED         RID_STRING_START + 91
-#define STR_TABLEDESIGN_DUPLICATE_NAME      RID_STRING_START + 92
-#define STR_SVT_SQL_INTERNATIONAL           RID_STRING_START + 93
-#define STR_SVT_SQL_SYNTAX_ERROR            RID_STRING_START + 94
-#define STR_SVT_SQL_SYNTAX_ERROR_BEFORE     RID_STRING_START + 95
-#define STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE    RID_STRING_START + 96
-#define STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE    RID_STRING_START + 97
-#define STR_SVT_SQL_SYNTAX_NO_NUM           RID_STRING_START + 98
-#define STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID  RID_STRING_START + 99
-#define STR_SVT_SQL_SYNTAX_INT_NO_VALID     RID_STRING_START + 100
-#define STR_SVT_SQL_SYNTAX_REAL_NO_VALID    RID_STRING_START + 101
-#define STR_SVT_SQL_SYNTAX_REAL_NO_INT      RID_STRING_START + 102
-#define STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE  RID_STRING_START + 103
-#define STR_TBL_COLUMN_IS_KEYCOLUMN         RID_STRING_START + 104
-#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE   RID_STRING_START + 105
-#define STR_COLUMN_NAME                     RID_STRING_START + 106
-#define STR_QRY_CONTINUE                    RID_STRING_START + 107
-#define STR_STAT_WARNING                    RID_STRING_START + 108
-#define STR_HTML_TITLE                      RID_STRING_START + 109
-#define STR_RTF_TITLE                       RID_STRING_START + 110
-#define STR_WIZ_COLUMN_SELECT_TITEL         RID_STRING_START + 111
-#define STR_WIZ_TYPE_SELECT_TITEL           RID_STRING_START + 112
-#define STR_WIZ_PKEY_ALREADY_DEFINED        RID_STRING_START + 113
-#define STR_WIZ_NAME_MATCHING_TITEL         RID_STRING_START + 114
-#define STR_WIZ_TABLE_COPY                  RID_STRING_START + 115
-#define STR_COPYTABLE_TITLE_COPY            RID_STRING_START + 116
-#define STR_COPYTABLE_TITLE_MOVE            RID_STRING_START + 117
-#define STR_DUPL_FIELDNAME                  RID_STRING_START + 118
-#define STR_ERR_DUPL_TABLENAME              RID_STRING_START + 119
-#define STR_QUERY_DELETE_TABLE              RID_STRING_START + 120
-#define STR_QUERY_DELETE_QUERY              RID_STRING_START + 121
-#define STR_TITLE_CONFIRM_DELETION          RID_STRING_START + 122
-#define STR_SVT_SQL_SYNTAX_TABLE            RID_STRING_START + 123
-#define STR_SVT_SQL_SYNTAX_COLUMN           RID_STRING_START + 124
-#define STR_QUERY_REL_EDIT_RELATION         RID_STRING_START + 125
-#define STR_RELATIONDESIGN                  RID_STRING_START + 126
-#define STR_RELATIONDESIGN_NOT_AVAILABLE    RID_STRING_START + 127
-#define STR_OPENTABLES_WARNINGS             RID_STRING_START + 128
-#define STR_OPENTABLES_WARNINGS_DETAILS     RID_STRING_START + 129
-#define STR_TABLEDESIGN_CONNECTION_MISSING  RID_STRING_START + 130
-#define STR_ADABAS_HELP_TRANSACT            RID_STRING_START + 131
-#define STR_ADABAS_HELP_DATADEVSPACES       RID_STRING_START + 132
-#define STR_ADABAS_HELP_SIZE                RID_STRING_START + 133
-#define STR_ADABAS_HELP_FREESIZE            RID_STRING_START + 134
-#define STR_ADABAS_HELP_MEMORYUSING         RID_STRING_START + 135
-#define STR_ADABAS_HELP_SYSDEVSPACE         RID_STRING_START + 136
-#define STR_TAB_INDEX_SORTORDER             RID_STRING_START + 137
-#define STR_TAB_INDEX_FIELD                 RID_STRING_START + 138
-#define STR_ORDER_ASCENDING                 RID_STRING_START + 139
-#define STR_ORDER_DESCENDING                RID_STRING_START + 140
-#define STR_CONFIRM_DROP_INDEX              RID_STRING_START + 141
-#define STR_LOGICAL_INDEX_NAME              RID_STRING_START + 142
-#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME  RID_STRING_START + 143
-#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD    RID_STRING_START + 144
-#define STR_TABLEDESIGN_NO_PRIM_KEY         RID_STRING_START + 145
-#define STR_TABLEDESIGN_TITLE               RID_STRING_START + 146
-#define STR_CONNECTING_DATASOURCE           RID_STRING_START + 147
-#define STR_LOADING_QUERY                   RID_STRING_START + 148
-#define STR_LOADING_TABLE                   RID_STRING_START + 149
-#define STR_VIEW_TITLE                      RID_STRING_START + 150
-#define STR_QUERYDESIGN_NO_VIEW_SUPPORT     RID_STRING_START + 151
-#define STR_QUERYDESIGN_NO_VIEW_ASK         RID_STRING_START + 152
-#define STR_QUERY_OBJECTS                   RID_STRING_START + 153
-#define STR_DOCUMENT_OBJECTS                RID_STRING_START + 154
-#define STR_QUERY_DROP_DOCUMENT_LINK        RID_STRING_START + 155
-#define STR_LINKEDDOC_DOESNOTEXIST          RID_STRING_START + 156
-#define STR_UNEXPECTED_ERROR                RID_STRING_START + 157
-#define STR_COULDNOTOPEN_LINKEDDOC          RID_STRING_START + 158
-#define RID_STR_BOOKMARKS_CONTAINER         RID_STRING_START + 159
-#define STR_INDEX_NAME_ALREADY_USED         RID_STRING_START + 160
-#define STR_ASK_FOR_DIRECTORY_CREATION      RID_STRING_START + 161
-#define STR_COULD_NOT_CREATE_DIRECTORY      RID_STRING_START + 162
-#define STR_MISSING_TABLES_XDROP            RID_STRING_START + 163
-#define STR_BUTTON_TEXT_ALL                 RID_STRING_START + 164
-#define STR_ADDRESSBOOK_SYSTEM              RID_STRING_START + 165
-#define STR_ADDRESSBOOK_MOZILLA             RID_STRING_START + 166
-#define STR_ADDRESSBOOK_LDAP                RID_STRING_START + 167
-#define STR_ADDRESSBOOK_OUTLOOK             RID_STRING_START + 168
-#define STR_COMMAND_EXECUTED_SUCCESSFULLY   RID_STRING_START + 169
-#define STR_DIRECTSQL_CONNECTIONLOST        RID_STRING_START + 170
-
-#define STR_TABLE_PRIV_SELECT               RID_STRING_START + 171
-#define STR_TABLE_PRIV_INSERT               RID_STRING_START + 172
-#define STR_TABLE_PRIV_DELETE               RID_STRING_START + 173
-#define STR_TABLE_PRIV_UPDATE               RID_STRING_START + 174
-#define STR_TABLE_PRIV_ALTER                RID_STRING_START + 175
-#define STR_TABLE_PRIV_REFERENCE            RID_STRING_START + 176
-#define STR_TABLE_PRIV_DROP                 RID_STRING_START + 177
-#define STR_TABLE_PRIV_NAME                 RID_STRING_START + 178
-#define STR_DSBROWSER_TITLE                 RID_STRING_START + 179
-#define STR_ADABAS_ERROR_SYSTEMTABLES       RID_STRING_START + 180
-#define STR_TABLEDESIGN_ALTER_ERROR         RID_STRING_START + 181
-#define STR_QUERY_REL_DELETE_WINDOW         RID_STRING_START + 182
-#define STR_NO_TABLE_FORMAT_INSIDE          RID_STRING_START + 183
-#define STR_ERROR_PASSWORDS_NOT_IDENTICAL   RID_STRING_START + 184
-#define STR_TABLEDESIGN_DATASOURCE_DELETED  RID_STRING_START + 185
-#define STR_DATASOURCE_DELETED              RID_STRING_START + 186
-#define STR_CALCDOC_DOESNOTEXIST            RID_STRING_START + 187
-#define STR_COULDNOTCONNECT_DATASOURCE      RID_STRING_START + 188
-#define STR_HINT_READONLY_CONNECTION        RID_STRING_START + 189
-#define STR_HINT_CONNECTION_NOT_CAPABLE     RID_STRING_START + 190
-#define STR_OBJECT_ALREADY_EXISTS           RID_STRING_START + 191
-#define STR_NO_COLUMNNAME_MATCHING          RID_STRING_START + 192
-#define STR_ERROR_OCCURED_WHILE_COPYING     RID_STRING_START + 193
-#define STR_QUERY_DROP_ALL                  RID_STRING_START + 194
-#define STR_DATASOURCE_GRIDCONTROL_NAME     RID_STRING_START + 195
-#define STR_DATASOURCE_GRIDCONTROL_DESC     RID_STRING_START + 196
-#define STR_QRY_ILLEGAL_JOIN                RID_STRING_START + 197
-#define STR_QRY_TOO_LONG_STATEMENT          RID_STRING_START + 198
-#define STR_QRY_SYNTAX                      RID_STRING_START + 199
-#define STR_QRY_NATIVE                      RID_STRING_START + 200
-#define STR_QRY_TOO_MANY_TABLES             RID_STRING_START + 201
-#define STR_QRY_TOOMANYCOND                 RID_STRING_START + 202
-#define STR_QRY_TOO_MANY_COLUMNS            RID_STRING_START + 203
-#define STR_QRY_TOOCOMPLEX                  RID_STRING_START + 204
-#define STR_QRY_NOSELECT                    RID_STRING_START + 205
-#define STR_QRY_COLUMN_NOT_FOUND            RID_STRING_START + 206
-#define STR_QRY_JOIN_COLUMN_COMPARE         RID_STRING_START + 207
-#define STR_QRY_LIKE_LEFT_NO_COLUMN         RID_STRING_START + 208
-#define STR_QRY_CHECK_CASESENSITIVE         RID_STRING_START + 209
-#define STR_AUTOINCREMENT_VALUE             RID_STRING_START + 210
-#define STR_HELP_AUTOINCREMENT_VALUE        RID_STRING_START + 211
-
-
+#define STR_TBL_TITLE                       RID_STR_GEN_START
+#define STR_OBJECT_ALREADY_EXSISTS          RID_STR_GEN_START + 1
+#define RID_STR_CONNECTION_LOST             RID_STR_GEN_START + 2
+#define STR_OBJECT_ALREADY_EXISTS           RID_STR_GEN_START + 3
+#define STR_QUERY_DROP_DOCUMENT_LINK        RID_STR_GEN_START + 4
+#define STR_TITLE_CONFIRM_DELETION          RID_STR_GEN_START + 5
+#define STR_STAT_WARNING                    RID_STR_GEN_START + 6
+#define STR_TABLEDESIGN_DATASOURCE_DELETED  RID_STR_GEN_START + 7
+#define STR_TABLEDESIGN_DBFIELDTYPES        RID_STR_GEN_START + 8
+#define STR_QRY_CONTINUE                    RID_STR_GEN_START + 9
+#define STR_COLUMN_NAME                     RID_STR_GEN_START + 10
+#define STR_ERROR_OCCURED_WHILE_COPYING     RID_STR_GEN_START + 11
+#define STR_MISSING_TABLES_XDROP            RID_STR_GEN_START + 12
+#define STR_QUERY_DELETE_TABLE              RID_STR_GEN_START + 13
+#define STR_BUTTON_TEXT_ALL                 RID_STR_GEN_START + 14
+#define STR_COULDNOTCREATE_DRIVERMANAGER    RID_STR_GEN_START + 15
+#define STR_UNEXPECTED_ERROR                RID_STR_GEN_START + 16
+#define STR_REMEMBERPASSWORD_SESSION        RID_STR_GEN_START + 17
+#define STR_ENTER_CONNECTION_PASSWORD       RID_STR_GEN_START + 18
+#define STR_NOREGISTEREDDRIVER              RID_STR_GEN_START + 19
+#define STR_DATASOURCE_DELETED              RID_STR_GEN_START + 20
+#define STR_QUERY_UNDO_MODIFYSQLEDIT        RID_STR_GEN_START + 21
+#define STR_QUERY_DELETE_QUERY              RID_STR_GEN_START + 22
+#define STR_QRY_TITLE                       RID_STR_GEN_START + 23
+#define STR_VIEW_TITLE                      RID_STR_GEN_START + 24
+#define STR_GENERAL_SDB_ERROR               RID_STR_GEN_START + 25
 //========================================================================
 // untyped resources
 
@@ -533,6 +371,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.78  2002/07/30 07:07:07  oj
+ *  #101846# - STR_ERR_LIKE_COLUMN
+ *
  *  Revision 1.77  2002/07/22 07:35:54  oj
  *  #101514# remove resource entries for PLUS and MINUS
  *
diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx
index 1d15d113e098..151e350a3038 100644
--- a/dbaccess/source/ui/inc/undosqledit.hxx
+++ b/dbaccess/source/ui/inc/undosqledit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undosqledit.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-01-11 07:11:22 $
+ *  last change: $Author: oj $ $Date: 2002-08-19 07:28: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_GENERALUNDO_HXX
 #include "GeneralUndo.hxx"
 #endif
-#ifndef _DBU_RESOURCE_HRC_
-#include "dbu_resource.hrc"
+#ifndef _DBU_CONTROL_HRC_
+#include "dbu_control.hrc"
 #endif
 
 namespace dbaui