#86839# flush scanner buffer

1 files changed, 4 insertions, 113 deletions

diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 5bb04a2680b4..a52d48d16487 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertyids.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:34:11 $
+ *  last change: $Author: oj $ $Date: 2001-05-25 13:09:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,60 +84,6 @@ namespace dbtools
         ~OPropertyMap();
         ::rtl::OUString getNameByIndex(sal_Int32 _nIndex) const;
     };
-
-    extern const sal_Char* getPROPERTY_QUERYTIMEOUT();
-    extern const sal_Char* getPROPERTY_MAXFIELDSIZE();
-    extern const sal_Char* getPROPERTY_MAXROWS();
-    extern const sal_Char* getPROPERTY_CURSORNAME();
-    extern const sal_Char* getPROPERTY_RESULTSETCONCURRENCY();
-    extern const sal_Char* getPROPERTY_RESULTSETTYPE();
-    extern const sal_Char* getPROPERTY_FETCHDIRECTION();
-    extern const sal_Char* getPROPERTY_FETCHSIZE();
-    extern const sal_Char* getPROPERTY_ESCAPEPROCESSING();
-    extern const sal_Char* getPROPERTY_USEBOOKMARKS();
-
-    extern const sal_Char* getPROPERTY_NAME();
-    extern const sal_Char* getPROPERTY_TYPE();
-    extern const sal_Char* getPROPERTY_TYPENAME();
-    extern const sal_Char* getPROPERTY_PRECISION();
-    extern const sal_Char* getPROPERTY_SCALE();
-    extern const sal_Char* getPROPERTY_ISNULLABLE();
-    extern const sal_Char* getPROPERTY_ISAUTOINCREMENT();
-    extern const sal_Char* getPROPERTY_ISROWVERSION();
-    extern const sal_Char* getPROPERTY_DESCRIPTION();
-    extern const sal_Char* getPROPERTY_DEFAULTVALUE();
-
-    extern const sal_Char* getPROPERTY_REFERENCEDTABLE();
-    extern const sal_Char* getPROPERTY_UPDATERULE();
-    extern const sal_Char* getPROPERTY_DELETERULE();
-    extern const sal_Char* getPROPERTY_CATALOG();
-    extern const sal_Char* getPROPERTY_ISUNIQUE();
-    extern const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX();
-    extern const sal_Char* getPROPERTY_ISCLUSTERED();
-    extern const sal_Char* getPROPERTY_ISASCENDING();
-    extern const sal_Char* getPROPERTY_SCHEMANAME();
-    extern const sal_Char* getPROPERTY_CATALOGNAME();
-    extern const sal_Char* getPROPERTY_COMMAND();
-    extern const sal_Char* getPROPERTY_CHECKOPTION();
-    extern const sal_Char* getPROPERTY_PASSWORD();
-    extern const sal_Char* getPROPERTY_RELATEDCOLUMN();
-
-    extern const sal_Char* getSTAT_INVALID_INDEX();
-
-    extern const sal_Char* getPROPERTY_FUNCTION();
-    extern const sal_Char* getPROPERTY_TABLENAME();
-    extern const sal_Char* getPROPERTY_REALNAME();
-    extern const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED();
-    extern const sal_Char* getPROPERTY_ISCURRENCY();
-
-    extern const sal_Char* getPROPERTY_ISBOOKMARKABLE();
-//  ====================================================
-//  error messages
-//  ====================================================
-    extern const sal_Char* getERRORMSG_SEQUENCE();
-    extern const sal_Char* getSQLSTATE_SEQUENCE();
-    extern const sal_Char* getSQLSTATE_GENERAL();
-    extern const sal_Char* getSTR_DELIMITER();
 }
 
 namespace connectivity
@@ -157,63 +103,6 @@ namespace connectivity
         private:
             UStringDescription();
         };
-
-//#define DECLARE_CONSTASCII_USTRING(name,nsp)  \
-//  extern connectivity::nsp::UStringDescription name;
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_CURSORNAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_FETCHSIZE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_MAXROWS,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_NAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_TYPENAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_PRECISION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_SCALE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISNULLABLE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISAUTOINCREMENT,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISROWVERSION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_DESCRIPTION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTVALUE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATERULE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_DELETERULE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOG,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISUNIQUE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISPRIMARYKEYINDEX,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISCLUSTERED,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISASCENDING,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_SCHEMANAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOGNAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_CHECKOPTION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_PASSWORD,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_RELATEDCOLUMN,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_FUNCTION,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_TABLENAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_REALNAME,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_DBASEPRECISIONCHANGED,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISCURRENCY,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(PROPERTY_ISBOOKMARKABLE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//
-//  // error msg
-//  DECLARE_CONSTASCII_USTRING(STAT_INVALID_INDEX,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(ERRORMSG_SEQUENCE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(SQLSTATE_SEQUENCE,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL,CONNECTIVITY_PROPERTY_NAME_SPACE)
-//  DECLARE_CONSTASCII_USTRING(STR_DELIMITER,CONNECTIVITY_PROPERTY_NAME_SPACE)
-
     }
 }
 
@@ -282,6 +171,8 @@ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaCon
 #define PROPERTY_ID_HY010                           43
 #define PROPERTY_ID_HY0000                          44
 #define PROPERTY_ID_DELIMITER                       45
+#define PROPERTY_ID_FORMATKEY                       46
+#define PROPERTY_ID_LOCALE                          47
 
 #endif // _CONNECTIVITY_PROPERTYIDS_HXX_