make strings unique for lib's

3 files changed, 148 insertions, 79 deletions

diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 2d7bcdfe06..31806bb34c 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcode.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $
+ *  last change: $Author: oj $ $Date: 2000-10-24 15:13:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,10 @@
 #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
 #include "connectivity/CommonTools.hxx"
 #endif
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
+//#define CONNECTIVITY_PROPERTY_NAME_SPACE file
+//#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
+//#include "propertyids.hxx"
+//#endif
 #ifndef _RTTI_HXX //autogen
 #include <tools/rtti.hxx>
 #endif
@@ -168,10 +169,7 @@ namespace connectivity
         public:
             OFILEOperandAttr(sal_uInt16 _nPos,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>& _xColumn);
 
-            virtual sal_Bool isIndexed() const 
-            {
-                return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>(m_xColumn,::com::sun::star::uno::UNO_QUERY)->getPropertySetInfo()->hasPropertyByName(connectivity::PROPERTY_ISASCENDING);
-            }
+            virtual sal_Bool isIndexed() const;
             virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0);
             TYPEINFO();
         };
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 6cc60263bf..f407e23582 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OFunctiondefs.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: patrick.luby $ $Date: 2000-09-22 05:50:03 $
+ *  last change: $Author: oj $ $Date: 2000-10-24 15:13:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,9 +65,7 @@
 
 #if defined(WIN) || defined(WNT)
 
-//	#include <tools/prewin.h>
 #include <odbc/sqlext.h>
-//	#include <tools/postwin.h>
 
 #ifndef SQL_C_BOOKMARK
 #define SQL_C_BOOKMARK   SQL_C_ULONG                     /* BOOKMARK         */
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 1951b101bd..760af20911 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertyids.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:24 $
+ *  last change: $Author: oj $ $Date: 2000-10-24 15:13:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,86 +61,159 @@
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #define _CONNECTIVITY_PROPERTYIDS_HXX_
 
+// this define has to be set to split the names into different dll's or so's
+// every dll has his own set of property names
+#ifndef CONNECTIVITY_PROPERTY_NAME_SPACE
+#pragma warning("CONNECTIVITY_PROPERTY_NAME_SPACE not set")
+#endif
+
+#ifndef _RTL_USTRING_
+#include <rtl/ustring>
+#endif
 
 namespace connectivity
 {
-    struct UStringDescription
+namespace dbtools
+{
+    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_REFERENCEDCOLUMN();		
+                                                        
+    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();
+}
+}
+
+namespace connectivity
+{
+    namespace CONNECTIVITY_PROPERTY_NAME_SPACE
     {
-        const sal_Char*	pZeroTerminatedName;
-
-        UStringDescription(sal_Char* _pName) { pZeroTerminatedName = _pName; }
-        operator ::rtl::OUString() const { return ::rtl::OUString::createFromAscii(pZeroTerminatedName); }
-    private:
-        UStringDescription();
-    };
-
-#define DECLARE_CONSTASCII_USTRING(name)	\
-    extern connectivity::UStringDescription name;
-
-#define IMPLEMENT_CONSTASCII_USTRING(name, asciivalue)	\
-    connectivity::UStringDescription name(asciivalue)
-
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_CURSORNAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_FETCHSIZE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_MAXROWS)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS)
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_NAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_TYPENAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_PRECISION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_SCALE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISNULLABLE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISAUTOINCREMENT)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISROWVERSION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_DESCRIPTION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTVALUE)
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATERULE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_DELETERULE)
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOG)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISUNIQUE)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISPRIMARYKEYINDEX)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISCLUSTERED)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISASCENDING)
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_SCHEMANAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOGNAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_CHECKOPTION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_PASSWORD)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDCOLUMN)
-
-    DECLARE_CONSTASCII_USTRING(PROPERTY_FUNCTION)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_TABLENAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_REALNAME)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_DBASEPRECISIONCHANGED)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISCURRENCY)
-    DECLARE_CONSTASCII_USTRING(PROPERTY_ISBOOKMARKABLE)
+        typedef const sal_Char* (*PVFN)();
+
+        struct UStringDescription
+        {
+            const sal_Char*	pZeroTerminatedName;
+            sal_Int32 nLength;
+
+            UStringDescription(PVFN _fCharFkt); 
+            operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
+            ~UStringDescription();
+        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_REFERENCEDCOLUMN,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)
+    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);
+
+    }
 }
 
 
 //------------------------------------------------------------------------------
 #define DECL_PROP1IMPL(varname, type) \
-        pProperties[nPos++] = ::com::sun::star::beans::Property(connectivity::PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] = ::com::sun::star::beans::Property(connectivity::CONNECTIVITY_PROPERTY_NAME_SPACE::PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
 //------------------------------------------------------------------------------
 #define DECL_PROP0(varname, type)	\
     DECL_PROP1IMPL(varname, type) 0)
 //------------------------------------------------------------------------------
 #define DECL_BOOL_PROP1IMPL(varname) \
-        pProperties[nPos++] = ::com::sun::star::beans::Property(connectivity::PROPERTY_##varname, PROPERTY_ID_##varname, ::getBooleanCppuType(),
+        pProperties[nPos++] = ::com::sun::star::beans::Property(connectivity::CONNECTIVITY_PROPERTY_NAME_SPACE::PROPERTY_##varname, PROPERTY_ID_##varname, ::getBooleanCppuType(),
 //------------------------------------------------------------------------------
 #define DECL_BOOL_PROP0(varname)	\
     DECL_BOOL_PROP1IMPL(varname) 0)