CWS-TOOLING: integrate CWS sb102

2008-12-11 16:18:12 +0100 sb  r265332 : #i95065# cleanup, to make Windows linking work
2008-12-11 16:16:03 +0100 sb  r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT
2008-12-09 17:40:28 +0100 sb  r265122 : #i94469# move CJK specific configuration data to brand layer
2008-12-09 16:09:08 +0100 sb  r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms
2008-12-09 15:54:31 +0100 sb  r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC
2008-12-09 15:40:51 +0100 sb  r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab
2008-12-09 15:36:21 +0100 sb  r265102 : #i95501# updated SDK_HOME
2008-12-09 15:31:46 +0100 sb  r265099 : typo (temppath vs. tmppath)
2008-12-08 11:48:08 +0100 sb  r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory)
2008-12-07 19:41:07 +0100 sb  r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X
2008-12-06 23:54:49 +0100 sb  r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS
2008-12-05 20:29:23 +0100 sb  r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file
2008-12-05 15:37:23 +0100 sb  r264908 : #i95315# removed obsolete jut
2008-12-05 15:34:59 +0100 sb  r264907 : #i95531# removed empty obsolete directories
2008-12-05 10:09:23 +0100 sb  r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 14:50:20 +0100 sb  r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does
2008-12-03 11:29:38 +0100 sb  r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all)
2008-12-02 17:18:31 +0100 sb  r264724 : #i96809# silenced GCC 4.3.2 warning
2008-12-02 13:29:34 +0100 sb  r264695 : #i96797# make get_tmp_dir fail less often
2008-11-28 17:19:24 +0100 sb  r264566 : #i95691# inadvertently missing from -c 264564
2008-11-28 17:07:50 +0100 sb  r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers
2008-11-25 13:28:08 +0100 sb  r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np)
2008-11-21 14:45:22 +0100 sb  r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE
2008-11-19 13:19:37 +0100 sb  r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties

8 files changed, 11 insertions, 496 deletions

diff --git a/dbaccess/source/shared/apitools.cxx b/dbaccess/source/shared/apitools.cxx
deleted file mode 100644
index 33dd640770e3..000000000000
--- a/dbaccess/source/shared/apitools.cxx
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: apitools.cxx,v $
- * $Revision: 1.11 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
-
-#ifndef _DBASHARED_APITOOLS_HXX_
-#include "apitools.hxx"
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
-#include "dbastrings.hrc"
-#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
-#include <cppuhelper/typeprovider.hxx>
-#endif
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _OSL_DIAGNOSE_H_
-#include <osl/diagnose.h>
-#endif
-#ifndef _TOOLS_DEBUG_HXX
-#include <tools/debug.hxx>
-#endif
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace cppu;
-using namespace osl;
-using namespace dbaccess;
-
-//==================================================================================
-//= various helper functions
-//==================================================================================
-//============================================================
-//= OSubComponent
-//============================================================
-DBG_NAME(OSubComponent)
-//--------------------------------------------------------------------------
-OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xParent)
-              :OComponentHelper(_rMutex)
-              ,m_xParent(xParent)
-{
-    DBG_CTOR(OSubComponent,NULL);
-
-}
-// -----------------------------------------------------------------------------
-OSubComponent::~OSubComponent()
-{
-    m_xParent = NULL;
-
-    DBG_DTOR(OSubComponent,NULL);
-}
-
-// com::sun::star::lang::XTypeProvider
-//--------------------------------------------------------------------------
-Sequence< Type > OSubComponent::getTypes() throw (RuntimeException)
-{
-    OTypeCollection aTypes(::getCppuType( (const Reference< XComponent > *)0 ),
-                           ::getCppuType( (const Reference< XTypeProvider > *)0 ),
-                           ::getCppuType( (const Reference< XWeak > *)0 ));
-
-    return aTypes.getTypes();
-}
-
-// XInterface
-//--------------------------------------------------------------------------
-void OSubComponent::acquire() throw ( )
-{
-    OComponentHelper::acquire();
-}
-
-//--------------------------------------------------------------------------
-void OSubComponent::release() throw ( )
-{
-    Reference< XInterface > x( xDelegator );
-    if (! x.is())
-    {
-        if (osl_decrementInterlockedCount( &m_refCount ) == 0 && m_refCount == 0 )
-        {
-            OSL_ENSURE( m_refCount == 0, "OSubComponent::release: why the hell is this false!" );
-            if (! rBHelper.bDisposed)
-            {
-                Reference< XInterface > xHoldAlive( *this );
-                // remember the parent
-                Reference< XInterface > xParent;
-                {
-                    MutexGuard aGuard( rBHelper.rMutex );
-                    xParent = m_xParent;
-                    m_xParent = NULL;
-                }
-
-                OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count!" );
-
-                // First dispose
-                dispose();
-
-                // only the alive ref holds the object
-                OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count!" );
-
-                // release the parent in the ~
-                if (xParent.is())
-                {
-                    MutexGuard aGuard( rBHelper.rMutex );
-                    m_xParent = xParent;
-                }
-
-                // destroy the object if xHoldAlive decrement the refcount to 0
-                return;
-            }
-        }
-        // restore the reference count
-        osl_incrementInterlockedCount( &m_refCount );
-    }
-
-    // as we cover the job of the componenthelper we use the ...
-    OWeakAggObject::release();
-}
-
-//--------------------------------------------------------------------------
-Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException)
-{
-    Any aReturn;
-    if (!rType.equals(::getCppuType(static_cast< Reference< XAggregation >* >(NULL))))
-        aReturn = OComponentHelper::queryInterface(rType);
-
-    return aReturn;
-}
-
-
diff --git a/dbaccess/source/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx
index 60b40dd60862..50e63970680c 100644
--- a/dbaccess/source/shared/cfgstrings.cxx
+++ b/dbaccess/source/shared/cfgstrings.cxx
@@ -34,7 +34,7 @@
 
 namespace dbacfg
 {
-#include "stringconstants.cxx"
+#include "stringconstants.inc"
 
     //============================================================
     //= configuration key names
diff --git a/dbaccess/source/shared/dbastrings.cxx b/dbaccess/source/shared/dbastrings.cxx
deleted file mode 100644
index 65d446386339..000000000000
--- a/dbaccess/source/shared/dbastrings.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbastrings.cxx,v $
- * $Revision: 1.11 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
-#include "dbastrings.hrc"
-#endif
-
-namespace dbaccess
-{
-
-#include "stringconstants.cxx"
-    //============================================================
-    //= SQLSTATE
-    //============================================================
-    IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL, "01000");
-
-    //============================================================
-    //= Properties
-    //============================================================
-    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFORMDESIGNMODE, "ApplyFormDesignMode");
-
-}
diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx
index 285fbd1d5354..875342b73b07 100644
--- a/dbaccess/source/shared/dbustrings.cxx
+++ b/dbaccess/source/shared/dbustrings.cxx
@@ -35,7 +35,7 @@
 namespace dbaui
 {
 
-#include "stringconstants.cxx"
+#include "stringconstants.inc"
 
     //============================================================
     //= URLs
diff --git a/dbaccess/source/shared/makefile.mk b/dbaccess/source/shared/makefile.mk
index 0eb36588c8ac..02157944689b 100644
--- a/dbaccess/source/shared/makefile.mk
+++ b/dbaccess/source/shared/makefile.mk
@@ -34,11 +34,10 @@ PRJINC=$(PRJ)$/source
 PRJNAME=dbaccess
 LIBTARGET=NO
 TARGET=shared
-LIB1TARGET=$(SLB)$/dbashared.lib
-LIB2TARGET=$(SLB)$/dbushared.lib
-LIB3TARGET=$(SLB)$/fltshared.lib
-LIB4TARGET=$(SLB)$/cfgshared.lib
-LIB5TARGET=$(SLB)$/sdbtshared.lib
+LIB1TARGET=$(SLB)$/dbushared.lib
+LIB2TARGET=$(SLB)$/fltshared.lib
+LIB3TARGET=$(SLB)$/cfgshared.lib
+LIB4TARGET=$(SLB)$/sdbtshared.lib
 
 #ENABLE_EXCEPTIONS=TRUE
 
@@ -50,7 +49,6 @@ LIB5TARGET=$(SLB)$/sdbtshared.lib
 
 # --- Files -------------------------------------
 EXCEPTIONSFILES=	\
-        $(SLO)$/apitools.obj	\
         $(SLO)$/dbu_reghelper.obj	\
         $(SLO)$/cfg_reghelper.obj	\
         $(SLO)$/flt_reghelper.obj
@@ -59,27 +57,21 @@ SLOFILES=	\
         $(EXCEPTIONSFILES)			\
         $(SLO)$/cfgstrings.obj		\
         $(SLO)$/xmlstrings.obj		\
-        $(SLO)$/dbastrings.obj		\
         $(SLO)$/dbustrings.obj
 
-
 LIB1OBJFILES=	\
-        $(SLO)$/dbastrings.obj	\
-        $(SLO)$/apitools.obj
-        
-LIB2OBJFILES=	\
         $(SLO)$/dbu_reghelper.obj	\
         $(SLO)$/dbustrings.obj
         
-LIB3OBJFILES=	\
+LIB2OBJFILES=	\
         $(SLO)$/flt_reghelper.obj	\
         $(SLO)$/xmlstrings.obj
         
-LIB4OBJFILES=	\
+LIB3OBJFILES=	\
         $(SLO)$/cfg_reghelper.obj	\
         $(SLO)$/cfgstrings.obj
 
-LIB5OBJFILES=	\
+LIB4OBJFILES=	\
         $(SLO)$/sdbtstrings.obj
 
 # --- Targets ----------------------------------
diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx
index f2a68576894f..3b45fef52c6b 100644
--- a/dbaccess/source/shared/sdbtstrings.cxx
+++ b/dbaccess/source/shared/sdbtstrings.cxx
@@ -34,5 +34,5 @@
 
 namespace sdbtools
 {
-    #include "stringconstants.cxx"
+    #include "stringconstants.inc"
 }
diff --git a/dbaccess/source/shared/stringconstants.cxx b/dbaccess/source/shared/stringconstants.cxx
deleted file mode 100644
index 55148de19e65..000000000000
--- a/dbaccess/source/shared/stringconstants.cxx
+++ /dev/null
@@ -1,271 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: stringconstants.cxx,v $
- * $Revision: 1.49 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// no include "precompiled_dbaccess.hxx" because this file is meant to
-// be included itself
-
-//============================================================
-//= property names
-//============================================================
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_URL, "URL");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INFO, "Info");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SETTINGS, "Settings");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISPASSWORDREQUIRED, "IsPasswordRequired");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABLEFILTER, "TableFilter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABLETYPEFILTER, "TableTypeFilter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME, "Name");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCHEMANAME, "SchemaName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CATALOGNAME, "CatalogName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRIVILEGES, "Privileges");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPE_PROCESSING, "EscapeProcessing");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND, "Command");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPE, "Type");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPENAME, "TypeName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRECISION, "Precision");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCALE, "Scale");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISNULLABLE, "IsNullable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISAUTOINCREMENT, "IsAutoIncrement");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISROWVERSION, "IsRowVersion");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DESCRIPTION, "Description");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTVALUE, "DefaultValue");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NUMBERFORMAT, "FormatKey");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT, "QueryTimeOut");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE, "MaxFieldSize");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS, "MaxRows");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORNAME, "CursorName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY, "ResultSetConcurrency");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE, "ResultSetType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION, "FetchDirection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHSIZE, "FetchSize");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS, "UseBookmarks");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISSEARCHABLE, "IsSearchable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISCURRENCY, "IsCurrency");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISSIGNED, "IsSigned");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DISPLAYSIZE, "DisplaySize");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL, "Label");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISREADONLY, "IsReadOnly");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISWRITABLE, "IsWritable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISDEFINITELYWRITABLE, "IsDefinitelyWritable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VALUE, "Value");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABLENAME, "TableName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISCASESENSITIVE, "IsCaseSensitive");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SERVICENAME, "ServiceName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISBOOKMARKABLE, "IsBookmarkable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANUPDATEINSERTEDROWS, "CanUpdateInsertedRows");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISSET, "IsSet");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISOUTPARAMETER, "IsOutParameter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NUMBERFORMATSSUPPLIER, "NumberFormatsSupplier");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISCALCULATED, "IsCalculated");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATABASE_LOCATION, "DatabaseLocation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONNECTION_RESOURCE, "ConnectionResource");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONNECTION_INFO, "ConnectionInfo");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULT_SET, "ResultSet");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SELECTION, "Selection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOOKMARK_SELECTION, "BookmarkSelection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COLUMN_NAME, "ColumnName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COLUMN, "Column");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCE, "DataSource");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRANSACTIONISOLATION, "TransactionIsolation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPEMAP, "TypeMap");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USER, "User");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PASSWORD, "Password");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND_TYPE, "CommandType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECOMMAND, "ActiveCommand");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION, "ActiveConnection");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFILTER, "ApplyFilter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORDER, "Order");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYORDER, "ApplyOrder");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISMODIFIED, "IsModified");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISNEW, "IsNew");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ROWCOUNT, "RowCount");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISROWCOUNTFINAL, "IsRowCountFinal");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELPFILENAME, "HelpFileName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH, "Width");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ROW_HEIGHT, "RowHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY, "FormatKey");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN, "Align");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT, "FontDescriptor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR, "TextColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD, "BoundField");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE, "DataField");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REALNAME, "RealName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISHIDDEN, "IsHidden");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_TABLENAME, "UpdateTableName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_SCHEMANAME, "UpdateSchemaName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_CATALOGNAME, "UpdateCatalogName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RELATIVEPOSITION, "RelativePosition");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLMODEL, "ControlModel");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISASCENDING, "IsAscending");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RELATEDCOLUMN, "RelatedColumn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISUNIQUE, "IsUnique");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISPRIMARYKEYINDEX, "IsPrimaryKeyIndex");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IGNORERESULT, "IgnoreResult");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATERULE, "UpdateRule");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DELETERULE, "DeleteRule");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE, "ReferencedTable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REFERENCEDCOLUMN, "ReferencedColumn");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARENTWINDOW, "ParentWindow");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SQLEXCEPTION, "SQLException");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER, "Border");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_THREADSAFE, "ThreadSafe");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELPTEXT  ,"HelpText");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLDEFAULT    ,"ControlDefault");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN    ,"Hidden");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE  ,"DefaultState");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL, "SuppressVersionColumns");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHOW_BROWSER, "ShowBrowser");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLE_BROWSER, "EnableBrowser");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHOWMENU, "ShowMenu");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LAYOUTINFORMATION, "LayoutInformation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURRENTTABLE, "CurrentTable");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATABASENAME, "DatabaseName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLUSER, "ControlUser");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLPASSWORD, "ControlPassword");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CACHESIZE, "CacheSize");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR, "TextLineColor");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTEMPHASIS, "FontEmphasisMark");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTRELIEF, "FontRelief");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTTEXT, "DefaultText");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT, "EffectiveDefault");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AUTOINCREMENTCREATION, "AutoIncrementCreation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOOLEANCOMPARISONMODE, "BooleanComparisonMode");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK, "EnableSQL92Check");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH,    "FontCharWidth");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET,      "FontCharset");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY,       "FontFamily");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT,       "FontHeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING,      "FontKerning");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME,         "FontName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION,  "FontOrientation");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH,        "FontPitch");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT,        "FontSlant");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT,    "FontStrikeout");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME,    "FontStyleName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE,    "FontUnderline");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT,       "FontWeight");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH,        "FontWidth");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE,         "FontType");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PERSISTENT_NAME,  "PersistentName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMBEDDEDOBJECT,   "EmbeddedObject");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIGINAL,         "Original");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USECATALOGINSELECT,"UseCatalogInSelect");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USESCHEMAINSELECT, "UseSchemaInSelect");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OUTERJOINESCAPE,  "EnableOuterJoinEscape");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AS_TEMPLATE,      "AsTemplate");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HAVING_CLAUSE,    "HavingClause");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP_BY,         "GroupBy");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EDIT_WIDTH, "EditWidth");
-
-//============================================================
-//= service names
-//============================================================
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_RESULTSET, "com.sun.star.sdbc.ResultSet");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_ROWSET, "com.sun.star.sdbc.RowSet");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_STATEMENT, "com.sun.star.sdbc.Statement");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_PREPAREDSTATEMENT, "com.sun.star.sdbc.PreparedStatement");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_CALLABLESTATEMENT, "com.sun.star.sdbc.CallableStatement");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_CONNECTION, "com.sun.star.sdbc.Connection");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_CONTAINER, "com.sun.star.sdbcx.Container");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_TABLE, "com.sun.star.sdbcx.Table");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_RESULTSET, "com.sun.star.sdbcx.ResultSet");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_CONNECTION, "com.sun.star.sdb.Connection");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMN, "com.sun.star.sdbcx.Column");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR, "com.sun.star.sdbcx.ColumnDescriptor");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS, "com.sun.star.sdb.ColumnSettings");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN, "com.sun.star.sdb.ResultColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN, "com.sun.star.sdb.DataColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT, "com.sun.star.sdb.DatabaseContext");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE, "com.sun.star.sdb.DataSource");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET, "com.sun.star.sdb.ResultSet");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ROWSET, "com.sun.star.sdb.RowSet");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_PREPAREDSTATMENT, "com.sun.star.sdb.PreparedStatement");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_CALLABLESTATEMENT, "com.sun.star.sdbc.CallableStatement");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_SQLQUERYCOMPOSER, "com.sun.star.sdb.SQLQueryComposer");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASETTINGS, "com.sun.star.sdb.DefinitionSettings");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERYDESCRIPTOR, "com.sun.star.sdb.QueryDescriptor");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERY, "com.sun.star.sdb.Query");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERYDEFINITION, "com.sun.star.sdb.QueryDefinition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNS, "com.sun.star.sdbcx.Columns");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_TABLES, "com.sun.star.sdbcx.Tables");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERIES, "com.sun.star.sdb.Queries");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER, "com.sun.star.sdbc.DriverManager");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_CONNECTIONPOOL, "com.sun.star.sdbc.ConnectionPool");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_INDEXCOLUMN, "com.sun.star.sdbcx.IndexColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN, "com.sun.star.sdbcx.KeyColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_INTERACTION_HANDLER, "com.sun.star.sdb.InteractionHandler");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_TASK_INTERACTION_HANDLER, "com.sun.star.task.InteractionHandler");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP, "com.sun.star.frame.Desktop");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ADABASCREATIONDIALOG, "com.sun.star.sdb.AdabasCreationDialog");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER, "com.sun.star.ui.dialogs.FolderPicker");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR, "com.sun.star.i18n.Collator");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_EXTENDED_ADABAS_DRIVER, "com.sun.star.comp.sdbcx.adabas.ODriver");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_TABLEDEFINITION, "com.sun.star.sdb.TableDefinition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COMMAND_DEFINITION,    "com.sun.star.sdb.CommandDefinition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DOCUMENTDEFINITION,    "com.sun.star.sdb.DocumentDefinition");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM,                 "com.sun.star.sdb.Form");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_FORM_COLLECTION,      "com.sun.star.sdb.Forms");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT,               "com.sun.star.sdb.Report");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_REPORT_COLLECTION,    "com.sun.star.sdb.Reports");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_QUERY_COLLECTION,     "com.sun.star.sdb.Queries");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_TABLE_COLLECTION,     "com.sun.star.sdb.Tables");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER, "com.sun.star.sdb.SingleSelectQueryComposer");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_APPLICATIONCONTROLLER, "org.openoffice.comp.dbu.OApplicationController");
-
-// info properties
-IMPLEMENT_CONSTASCII_USTRING(INFO_JDBCDRIVERCLASS,"JavaDriverClass");
-IMPLEMENT_CONSTASCII_USTRING(INFO_TEXTFILEEXTENSION,"Extension");
-IMPLEMENT_CONSTASCII_USTRING(INFO_CHARSET,"CharSet");
-IMPLEMENT_CONSTASCII_USTRING(INFO_TEXTFILEHEADER,"HeaderLine");
-IMPLEMENT_CONSTASCII_USTRING(INFO_FIELDDELIMITER,"FieldDelimiter");
-IMPLEMENT_CONSTASCII_USTRING(INFO_TEXTDELIMITER,"StringDelimiter");
-IMPLEMENT_CONSTASCII_USTRING(INFO_DECIMALDELIMITER,"DecimalDelimiter");
-IMPLEMENT_CONSTASCII_USTRING(INFO_THOUSANDSDELIMITER,"ThousandDelimiter");
-IMPLEMENT_CONSTASCII_USTRING(INFO_SHOWDELETEDROWS,"ShowDeleted");
-IMPLEMENT_CONSTASCII_USTRING(INFO_ALLOWLONGTABLENAMES,"NoNameLengthLimit");
-IMPLEMENT_CONSTASCII_USTRING(INFO_ADDITIONALOPTIONS,"SystemDriverSettings");
-IMPLEMENT_CONSTASCII_USTRING(INFO_AUTORETRIEVEVALUE,"AutoRetrievingStatement");
-IMPLEMENT_CONSTASCII_USTRING(INFO_AUTORETRIEVEENABLED,"IsAutoRetrievingEnabled");
-IMPLEMENT_CONSTASCII_USTRING(INFO_APPEND_TABLE_ALIAS,"AppendTableAliasName");
-IMPLEMENT_CONSTASCII_USTRING(INFO_AS_BEFORE_CORRELATION_NAME, "GenerateASBeforeCorrelationName" );
-IMPLEMENT_CONSTASCII_USTRING(INFO_FORMS_CHECK_REQUIRED_FIELDS, "FormsCheckRequiredFields" );
-IMPLEMENT_CONSTASCII_USTRING(INFO_PARAMETERNAMESUBST,"ParameterNameSubstitution");
-IMPLEMENT_CONSTASCII_USTRING(INFO_IGNOREDRIVER_PRIV,"IgnoreDriverPrivileges");
-IMPLEMENT_CONSTASCII_USTRING(INFO_USECATALOG,"UseCatalog");
-IMPLEMENT_CONSTASCII_USTRING(INFO_CONN_LDAP_BASEDN,"BaseDN");
-IMPLEMENT_CONSTASCII_USTRING(INFO_CONN_LDAP_ROWCOUNT,"MaxRowCount");
-IMPLEMENT_CONSTASCII_USTRING(INFO_PREVIEW,"Preview");
-IMPLEMENT_CONSTASCII_USTRING(INFO_MEDIATYPE,"MediaType");
-
-// other
-IMPLEMENT_CONSTASCII_USTRING(INFO_POOLURL,"PoolURL");
-IMPLEMENT_CONSTASCII_USTRING(URL_INTERACTIVE,"Interactive");
diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx
index d7a014abdfa1..ef20c2c6d114 100644
--- a/dbaccess/source/shared/xmlstrings.cxx
+++ b/dbaccess/source/shared/xmlstrings.cxx
@@ -34,6 +34,6 @@
 
 namespace dbaxml
 {
-#include "stringconstants.cxx"
+#include "stringconstants.inc"
 }