[Libreoffice-commits] core.git: dbaccess/Library_dba.mk dbaccess/Library_dbu.mk dbaccess/source
Miklos Vajna
vmiklos at suse.cz
Thu Apr 25 02:03:08 PDT 2013
dbaccess/Library_dba.mk | 1
dbaccess/Library_dbu.mk | 1
dbaccess/source/core/api/RowSet.cxx | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/core/api/TableDeco.cxx | 14
dbaccess/source/core/api/columnsettings.cxx | 16
dbaccess/source/core/api/definitioncolumn.cxx | 10
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/api/querycontainer.cxx | 2
dbaccess/source/core/api/table.cxx | 10
dbaccess/source/core/api/tablecontainer.cxx | 2
dbaccess/source/core/api/viewcontainer.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 4
dbaccess/source/core/dataaccess/documentcontainer.cxx | 6
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2
dbaccess/source/core/misc/apitools.cxx | 1
dbaccess/source/core/misc/dbastrings.cxx | 39 -
dbaccess/source/filter/xml/xmlExport.cxx | 6
dbaccess/source/filter/xml/xmlHelper.cxx | 27 -
dbaccess/source/inc/constasciistring.hxx | 38 -
dbaccess/source/inc/dbastrings.hrc | 14
dbaccess/source/inc/dbustrings.hrc | 46 -
dbaccess/source/inc/sdbtstrings.hrc | 6
dbaccess/source/inc/stringconstants.hrc | 240 ---------
dbaccess/source/inc/stringconstants.inc | 434 ++++++++---------
dbaccess/source/inc/xmlstrings.hrc | 10
dbaccess/source/shared/dbustrings.cxx | 65 --
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/browser/dbloader.cxx | 12
dbaccess/source/ui/browser/unodatbr.cxx | 8
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1
dbaccess/source/ui/misc/UITools.cxx | 8
dbaccess/source/ui/misc/WCopyTable.cxx | 2
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/uno/ColumnControl.cxx | 2
dbaccess/source/ui/uno/ColumnPeer.cxx | 8
dbaccess/source/ui/uno/composerdialogs.cxx | 4
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dbaccess/source/ui/uno/unoDirectSql.cxx | 2
40 files changed, 327 insertions(+), 732 deletions(-)
New commits:
commit e894e57aabceb0b2ccd69d129b5223e2a28596fa
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Apr 25 10:56:02 2013 +0200
dbaccess: {DECLARE,IMPLEMENT}_CONSTASCII_USTRING are no longer needed
Change-Id: Id404f8f3a5bdbf32c207ee81c6f6be9c9d328679
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index fa9eb6d..1e23040 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
dbaccess/source/core/misc/ContainerListener \
dbaccess/source/core/misc/ContainerMediator \
dbaccess/source/core/misc/DatabaseDataProvider \
- dbaccess/source/core/misc/dbastrings \
dbaccess/source/core/misc/dsntypes \
dbaccess/source/core/misc/module_dba \
dbaccess/source/core/misc/objectnameapproval \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 4b1dad1..59b843a 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -73,7 +73,6 @@ $(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu))
$(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/shared/dbu_reghelper \
- dbaccess/source/shared/dbustrings \
dbaccess/source/ui/app/AppController \
dbaccess/source/ui/app/AppControllerDnD \
dbaccess/source/ui/app/AppControllerGen \
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index abf7bae..a58a68a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1698,8 +1698,8 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
// a number of properties is plain copied
const OUString aPropertyNames[] = {
- PROPERTY_ALIGN, PROPERTY_RELATIVEPOSITION, PROPERTY_WIDTH, PROPERTY_HIDDEN, PROPERTY_CONTROLMODEL,
- PROPERTY_HELPTEXT, PROPERTY_CONTROLDEFAULT
+ OUString(PROPERTY_ALIGN), OUString(PROPERTY_RELATIVEPOSITION), OUString(PROPERTY_WIDTH), OUString(PROPERTY_HIDDEN), OUString(PROPERTY_CONTROLMODEL),
+ OUString(PROPERTY_HELPTEXT), OUString(PROPERTY_CONTROLDEFAULT)
};
for ( size_t i=0; i<sizeof( aPropertyNames ) / sizeof( aPropertyNames[0] ); ++i )
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index a6e6429..d84f000 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -302,7 +302,7 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void)
clearCurrentCollections();
}
IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
-IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER.ascii)
+IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index a101882..1994fac 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -344,17 +344,17 @@ void ODBTableDecorator::construct()
Property* pEnd = pIter + aTableProps.getLength();
for (;pIter != pEnd ; ++pIter)
{
- if (pIter->Name.equalsAsciiL(PROPERTY_CATALOGNAME.ascii, PROPERTY_CATALOGNAME.length))
+ if (pIter->Name == PROPERTY_CATALOGNAME)
pIter->Handle = PROPERTY_ID_CATALOGNAME;
- else if (pIter->Name.equalsAsciiL(PROPERTY_SCHEMANAME.ascii, PROPERTY_SCHEMANAME.length))
+ else if (pIter->Name == PROPERTY_SCHEMANAME)
pIter->Handle = PROPERTY_ID_SCHEMANAME;
- else if (pIter->Name.equalsAsciiL(PROPERTY_NAME.ascii, PROPERTY_NAME.length))
+ else if (pIter->Name == PROPERTY_NAME)
pIter->Handle = PROPERTY_ID_NAME;
- else if (pIter->Name.equalsAsciiL(PROPERTY_DESCRIPTION.ascii, PROPERTY_DESCRIPTION.length))
+ else if (pIter->Name == PROPERTY_DESCRIPTION)
pIter->Handle = PROPERTY_ID_DESCRIPTION;
- else if (pIter->Name.equalsAsciiL(PROPERTY_TYPE.ascii, PROPERTY_TYPE.length))
+ else if (pIter->Name == PROPERTY_TYPE)
pIter->Handle = PROPERTY_ID_TYPE;
- else if (pIter->Name.equalsAsciiL(PROPERTY_PRIVILEGES.ascii, PROPERTY_PRIVILEGES.length))
+ else if (pIter->Name == PROPERTY_PRIVILEGES)
pIter->Handle = PROPERTY_ID_PRIVILEGES;
}
@@ -382,7 +382,7 @@ void ODBTableDecorator::construct()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, "com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE.ascii)
+IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, "com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE)
Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(RuntimeException)
{
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 5cf277b..6ea73ad 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -136,14 +136,14 @@ namespace dbaccess
};
PropertyDescriptor aProps[] =
{
- { PROPERTY_ALIGN, PROPERTY_ID_ALIGN },
- { PROPERTY_NUMBERFORMAT, PROPERTY_ID_NUMBERFORMAT },
- { PROPERTY_RELATIVEPOSITION, PROPERTY_ID_RELATIVEPOSITION },
- { PROPERTY_WIDTH, PROPERTY_ID_WIDTH },
- { PROPERTY_HELPTEXT, PROPERTY_ID_HELPTEXT },
- { PROPERTY_CONTROLDEFAULT, PROPERTY_ID_CONTROLDEFAULT },
- { PROPERTY_CONTROLMODEL, PROPERTY_ID_CONTROLMODEL },
- { PROPERTY_HIDDEN, PROPERTY_ID_HIDDEN }
+ { OUString(PROPERTY_ALIGN), PROPERTY_ID_ALIGN },
+ { OUString(PROPERTY_NUMBERFORMAT), PROPERTY_ID_NUMBERFORMAT },
+ { OUString(PROPERTY_RELATIVEPOSITION), PROPERTY_ID_RELATIVEPOSITION },
+ { OUString(PROPERTY_WIDTH), PROPERTY_ID_WIDTH },
+ { OUString(PROPERTY_HELPTEXT), PROPERTY_ID_HELPTEXT },
+ { OUString(PROPERTY_CONTROLDEFAULT), PROPERTY_ID_CONTROLDEFAULT },
+ { OUString(PROPERTY_CONTROLMODEL), PROPERTY_ID_CONTROLMODEL },
+ { OUString(PROPERTY_HIDDEN), PROPERTY_ID_HIDDEN }
};
for ( size_t i=0; i < sizeof( aProps ) / sizeof( aProps[0] ); ++i )
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 3e27c73..adfb0be 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -94,7 +94,7 @@ OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeExcepti
Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException)
{
Sequence< OUString > aSNS( 2 );
- aSNS[0] = m_bActAsDescriptor ? SERVICE_SDBCX_COLUMNDESCRIPTOR : SERVICE_SDBCX_COLUMN;
+ aSNS[0] = m_bActAsDescriptor ? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN);
aSNS[1] = SERVICE_SDB_COLUMNSETTINGS;
return aSNS;
}
@@ -205,10 +205,10 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
};
PropertyDescriptor aProps[] =
{
- { PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME },
- { PROPERTY_SCHEMANAME, PROPERTY_ID_SCHEMANAME },
- { PROPERTY_TABLENAME, PROPERTY_ID_TABLENAME },
- { PROPERTY_REALNAME, PROPERTY_ID_REALNAME }
+ { OUString(PROPERTY_CATALOGNAME), PROPERTY_ID_CATALOGNAME },
+ { OUString(PROPERTY_SCHEMANAME), PROPERTY_ID_SCHEMANAME },
+ { OUString(PROPERTY_TABLENAME), PROPERTY_ID_TABLENAME },
+ { OUString(PROPERTY_REALNAME), PROPERTY_ID_REALNAME }
};
for ( size_t i=0; i < sizeof( aProps ) / sizeof( aProps[0] ); ++i )
{
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index c72f8bf..5bb8cb1 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -217,7 +217,7 @@ void OQuery::rebuildColumns()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery", SERVICE_SDB_DATASETTINGS.ascii, SERVICE_SDB_QUERY.ascii, "com.sun.star.sdb.QueryDefinition")
+IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery", SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY, "com.sun.star.sdb.QueryDefinition")
// ::com::sun::star::beans::XPropertyChangeListener
void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) throw(RuntimeException)
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 4e6d38f..7e0e05e 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -139,7 +139,7 @@ void OQueryContainer::disposing()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO2(OQueryContainer, "com.sun.star.sdb.dbaccess.OQueryContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDB_QUERIES.ascii)
+IMPLEMENT_SERVICE_INFO2(OQueryContainer, "com.sun.star.sdb.dbaccess.OQueryContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDB_QUERIES)
// XDataDescriptorFactory
Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor( ) throw(RuntimeException)
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index d1977c2..3fdb456 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -256,13 +256,13 @@ void ODBTable::construct()
Property* pEnd = pIter + aProps.getLength();
for(;pIter != pEnd;++pIter)
{
- if (pIter->Name.equalsAsciiL(PROPERTY_CATALOGNAME.ascii, PROPERTY_CATALOGNAME.length))
+ if (pIter->Name == PROPERTY_CATALOGNAME)
pIter->Attributes = PropertyAttribute::READONLY;
- else if (pIter->Name.equalsAsciiL(PROPERTY_SCHEMANAME.ascii, PROPERTY_SCHEMANAME.length))
+ else if (pIter->Name == PROPERTY_SCHEMANAME)
pIter->Attributes = PropertyAttribute::READONLY;
- else if (pIter->Name.equalsAsciiL(PROPERTY_DESCRIPTION.ascii, PROPERTY_DESCRIPTION.length))
+ else if (pIter->Name == PROPERTY_DESCRIPTION)
pIter->Attributes = PropertyAttribute::READONLY;
- else if (pIter->Name.equalsAsciiL(PROPERTY_NAME.ascii, PROPERTY_NAME.length))
+ else if (pIter->Name == PROPERTY_NAME)
pIter->Attributes = PropertyAttribute::READONLY;
}
}
@@ -276,7 +276,7 @@ void ODBTable::construct()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_SDBCX_TABLE.ascii)
+IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_SDBCX_TABLE)
Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException)
{
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 9fab58d..0d227ce 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -143,7 +143,7 @@ OUString OTableContainer::getTableTypeRestriction() const
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO2(OTableContainer, "com.sun.star.sdb.dbaccess.OTableContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDBCX_TABLES.ascii)
+IMPLEMENT_SERVICE_INFO2(OTableContainer, "com.sun.star.sdb.dbaccess.OTableContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDBCX_TABLES)
namespace
{
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index a8af2bb..c839d8b 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -81,7 +81,7 @@ OViewContainer::~OViewContainer()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDBCX_TABLES.ascii)
+IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDBCX_TABLES)
ObjectType OViewContainer::createObject(const OUString& _rName)
{
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index bfe39b7..f6e89f4 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -314,11 +314,11 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
{
m_xParentContainer.set(aValue.Value,UNO_QUERY);
}
- else if ( aValue.Name.equalsAsciiL(PROPERTY_NAME.ascii, PROPERTY_NAME.length) )
+ else if ( aValue.Name == PROPERTY_NAME )
{
aValue.Value >>= m_pImpl->m_aProps.aTitle;
}
- else if ( aValue.Name.equalsAsciiL(PROPERTY_PERSISTENT_NAME.ascii, PROPERTY_PERSISTENT_NAME.length) )
+ else if ( aValue.Name == PROPERTY_PERSISTENT_NAME )
{
aValue.Value >>= m_pImpl->m_aProps.sPersistentName;
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index fcd1bec..fb0138d 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -130,7 +130,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer)
Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) throw(RuntimeException)
{
Sequence< OUString > aSupported(1);
- aSupported[0] = m_bFormsContainer ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION;
+ aSupported[0] = m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION);
return aSupported;
}
@@ -313,11 +313,11 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
for(;pBegin != pEnd;++pBegin)
{
*pBegin >>= aValue;
- if ( aValue.Name.equalsAsciiL(PROPERTY_NAME.ascii, PROPERTY_NAME.length) )
+ if ( aValue.Name == PROPERTY_NAME)
{
aValue.Value >>= sName;
}
- else if ( aValue.Name.equalsAsciiL(PROPERTY_EMBEDDEDOBJECT.ascii, PROPERTY_EMBEDDEDOBJECT.length) )
+ else if ( aValue.Name == PROPERTY_EMBEDDEDOBJECT)
{
xCopyFrom.set(aValue.Value,UNO_QUERY);
}
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index a1a9b08..6ea9709 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -514,7 +514,7 @@ void SAL_CALL ODocumentDefinition::disposing()
IMPLEMENT_TYPEPROVIDER3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
IMPLEMENT_FORWARD_XINTERFACE3( ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base)
-IMPLEMENT_SERVICE_INFO1(ODocumentDefinition,"com.sun.star.comp.dba.ODocumentDefinition",SERVICE_SDB_DOCUMENTDEFINITION.ascii)
+IMPLEMENT_SERVICE_INFO1(ODocumentDefinition,"com.sun.star.comp.dba.ODocumentDefinition",SERVICE_SDB_DOCUMENTDEFINITION)
void ODocumentDefinition::registerProperties()
{
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index cdf690b..880c5ab 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace cppu;
using namespace osl;
-using namespace dbaccess;
//==================================================================================
//= various helper functions
diff --git a/dbaccess/source/core/misc/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx
deleted file mode 100644
index 305a2d5..0000000
--- a/dbaccess/source/core/misc/dbastrings.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dbastrings.hrc"
-
-namespace dbaccess
-{
-
-#include "stringconstants.inc"
- //============================================================
- //= SQLSTATE
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL, "01000");
-
- //============================================================
- //= Properties
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING( PROPERTY_APPLYFORMDESIGNMODE, "ApplyFormDesignMode" );
- IMPLEMENT_CONSTASCII_USTRING( PROPERTY_IS_FORM, "IsForm" );
- IMPLEMENT_CONSTASCII_USTRING( PROPERTY_PERSISTENT_PATH, "PersistentPath" );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 7afd9be..135ef75 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -946,14 +946,14 @@ void ODBExport::exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,cons
void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate)
{
OUString sValue;
- _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_TABLENAME : PROPERTY_NAME) >>= sValue;
+ _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_TABLENAME) : OUString(PROPERTY_NAME)) >>= sValue;
if ( !sValue.isEmpty() )
{
AddAttribute(XML_NAMESPACE_DB, XML_NAME,sValue);
- _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_SCHEMANAME : PROPERTY_SCHEMANAME) >>= sValue;
+ _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_SCHEMANAME) : OUString(PROPERTY_SCHEMANAME)) >>= sValue;
if ( !sValue.isEmpty() )
AddAttribute(XML_NAMESPACE_DB, XML_SCHEMA_NAME,sValue);
- _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_CATALOGNAME : PROPERTY_CATALOGNAME) >>= sValue;
+ _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_CATALOGNAME) : OUString(PROPERTY_CATALOGNAME)) >>= sValue;
if ( !sValue.isEmpty() )
AddAttribute(XML_NAMESPACE_DB, XML_CATALOG_NAME,sValue);
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 1ff8247..a410f08 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -85,7 +85,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper()
{
-#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
{
MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
@@ -99,9 +99,8 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper()
{
-#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_CELL( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aCellStylesProperties[] =
{
MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
@@ -120,16 +119,16 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper
MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+ MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_CONST_TEXT( "CharUnderlineHasColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -141,7 +140,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper()
{
-#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_ROW( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aStylesProperties[] =
{
MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx
deleted file mode 100644
index fca4cd1..0000000
--- a/dbaccess/source/inc/constasciistring.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _DBASHARED_CONSTASCIISTRING_HXX_
-#define _DBASHARED_CONSTASCIISTRING_HXX_
-
-#ifndef CONSTASCII_INCLUDED_INDIRECT
-#error "don't include this file directly! use stringconstants.hrc instead!"
-#endif
-
-
-// no namespaces. This file is included from several other files _within_ a namespace.
-
-#define DECLARE_CONSTASCII_USTRING( name ) \
- extern const ConstAsciiString name
-
-#define IMPLEMENT_CONSTASCII_USTRING( name, string ) \
- const ConstAsciiString name = {RTL_CONSTASCII_STRINGPARAM(string)}
-
-#endif // _DBASHARED_CONSTASCIISTRING_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc
index 056f70c..d054484 100644
--- a/dbaccess/source/inc/dbastrings.hrc
+++ b/dbaccess/source/inc/dbastrings.hrc
@@ -20,27 +20,23 @@
#define DBACCESS_SHARED_DBASTRINGS_HRC
#include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
-namespace dbaccess
-{
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
+#include "stringconstants.inc"
//============================================================
//= SQLSTATE
//============================================================
- DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL);
+ #define SQLSTATE_GENERAL "01000"
//============================================================
//= Properties
//============================================================
- DECLARE_CONSTASCII_USTRING( PROPERTY_APPLYFORMDESIGNMODE );
- DECLARE_CONSTASCII_USTRING( PROPERTY_IS_FORM );
- DECLARE_CONSTASCII_USTRING( PROPERTY_PERSISTENT_PATH );
-}
+ #define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode"
+ #define PROPERTY_IS_FORM "IsForm"
+ #define PROPERTY_PERSISTENT_PATH "PersistentPath"
#endif // DBACCESS_SHARED_DBASTRINGS_HRC
diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc
index f8e0d02..3f152e4 100644
--- a/dbaccess/source/inc/dbustrings.hrc
+++ b/dbaccess/source/inc/dbustrings.hrc
@@ -20,51 +20,47 @@
#define DBACCESS_SHARED_DBUSTRINGS_HRC
#include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
-namespace dbaui
-{
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
+#include "stringconstants.inc"
//============================================================
//= URLs
//============================================================
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_QUERYDESIGN);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_VIEWDESIGN);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_TABLEDESIGN);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_FORMGRIDVIEW);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_DATASOURCEBROWSER);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_APPLICATION);
- DECLARE_CONSTASCII_USTRING(URL_COMPONENT_REPORTDESIGN);
+ #define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign"
+ #define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign"
+ #define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign"
+ #define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView"
+ #define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser"
+ #define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign"
+ #define URL_COMPONENT_APPLICATION ".component:DB/Application"
+ #define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign"
//============================================================
//= service names
//============================================================
- DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG);
+ #define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog"
//============================================================
//= other DBU relevant strings
//============================================================
- DECLARE_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW);
- DECLARE_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT);
- DECLARE_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW);
- DECLARE_CONSTASCII_USTRING(PROPERTY_GRAPHICAL_DESIGN);
- DECLARE_CONSTASCII_USTRING(PROPERTY_HELP_URL);
+ #define FRAME_NAME_QUERY_PREVIEW "QueryPreview"
+ #define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl"
+ #define PROPERTY_QUERYDESIGNVIEW "QueryDesignView"
+ #define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign"
+ #define PROPERTY_HELP_URL "HelpURL"
//============================================================
//= other DBU properties
//============================================================
- DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE);
- DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN);
- DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL);
- DECLARE_CONSTASCII_USTRING(PROPERTY_TABSTOP);
- DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED);
- DECLARE_CONSTASCII_USTRING(PROPERTY_MOUSE_WHEEL_BEHAVIOR);
-}
+ #define PROPERTY_TRISTATE "TriState"
+ #define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape"
+ #define PROPERTY_TABSTOP "TabStop"
+ #define PROPERTY_DEFAULTCONTROL "DefaultControl"
+ #define PROPERTY_ENABLED "Enabled"
+ #define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
#endif // DBACCESS_SHARED_DBUSTRINGS_HRC
diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc
index d2fc87a..2268ad8 100644
--- a/dbaccess/source/inc/sdbtstrings.hrc
+++ b/dbaccess/source/inc/sdbtstrings.hrc
@@ -20,15 +20,11 @@
#define DBACCESS_SHARED_SDBTSTRINGS_HRC
#include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
-namespace sdbtools
-{
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-}
+#include "stringconstants.inc"
#endif // DBACCESS_SHARED_SDBTSTRINGS_HRC
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc
index 0784969..5cbba13 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -24,10 +24,6 @@
#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
#endif
-#define CONSTASCII_INCLUDED_INDIRECT
-#include "constasciistring.hxx"
-#undef CONSTASCII_INCLUDED_INDIRECT
-
//============================================================
//= property ids
//============================================================
@@ -177,242 +173,6 @@
#define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145
#define PROPERTY_ID_PROPCHANGE_NOTIFY 146
-//============================================================
-//= property names
-//============================================================
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_URL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_INFO);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SETTINGS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISPASSWORDREQUIRED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABLEFILTER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_NAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SCHEMANAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOGNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRIVILEGES);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPE_PROCESSING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND);
-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_NUMBERFORMAT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXROWS);
-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_USEBOOKMARKS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISSEARCHABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISCURRENCY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISSIGNED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DISPLAYSIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISREADONLY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISWRITABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISDEFINITELYWRITABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISCASESENSITIVE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SERVICENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISBOOKMARKABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CANUPDATEINSERTEDROWS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISSET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISOUTPARAMETER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERFORMATSSUPPLIER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISCALCULATED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATABASE_LOCATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONNECTION_RESOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONNECTION_INFO);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RESULT_SET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SELECTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOOKMARK_SELECTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COLUMN_NAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COLUMN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSACTIONISOLATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TYPEMAP);
-DECLARE_CONSTASCII_USTRING(PROPERTY_USER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PASSWORD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND_TYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECOMMAND);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_APPLYFILTER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ORDER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_APPLYORDER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISMODIFIED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISNEW);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ROWCOUNT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISROWCOUNTFINAL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HELPFILENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ROW_HEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_REALNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISHIDDEN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HIDDEN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABLETYPEFILTER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_TABLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_SCHEMANAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_CATALOGNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RELATIVEPOSITION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLMODEL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISASCENDING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RELATEDCOLUMN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISUNIQUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISPRIMARYKEYINDEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_IGNORERESULT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATERULE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DELETERULE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDCOLUMN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PARENTWINDOW);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SQLEXCEPTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_THREADSAFE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HELPTEXT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SHOW_BROWSER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLE_BROWSER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SHOWMENU);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LAYOUTINFORMATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CURRENTTABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATABASENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLUSER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLPASSWORD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CACHESIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTEMPHASIS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTRELIEF);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLDEFAULT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTTEXT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_AUTOINCREMENTCREATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOOLEANCOMPARISONMODE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARSET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTFAMILY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTKERNING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTPITCH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSLANT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTTYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PERSISTENT_NAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EMBEDDEDOBJECT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ORIGINAL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_USECATALOGINSELECT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_USESCHEMAINSELECT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_OUTERJOINESCAPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_AS_TEMPLATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HAVING_CLAUSE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP_BY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EDIT_WIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SINGLESELECTQUERYCOMPOSER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHANGE_NOTIFICATION_ENABLED);
-
-//============================================================
-//= service names
-//============================================================
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_RESULTSET);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_ROWSET);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_STATEMENT);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_PREPAREDSTATEMENT);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_CALLABLESTATEMENT);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_CONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_CONTAINER);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_TABLE);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_RESULTSET);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_CONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMN);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_INDEXCOLUMN);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_PREPAREDSTATMENT);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_CALLABLESTATEMENT);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_SQLQUERYCOMPOSER);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASETTINGS);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_QUERYDESCRIPTOR);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_QUERY);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNS);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_TABLES);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_QUERIES);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER);
-DECLARE_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP);
-DECLARE_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_FORM);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_FORM_COLLECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_REPORT);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_REPORT_COLLECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_QUERY_COLLECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_TABLE_COLLECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DOCUMENTDEFINITION);
-DECLARE_CONSTASCII_USTRING(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_APPLICATIONCONTROLLER);
-
-// info properties
-DECLARE_CONSTASCII_USTRING(INFO_JDBCDRIVERCLASS);
-DECLARE_CONSTASCII_USTRING(INFO_TEXTFILEEXTENSION);
-DECLARE_CONSTASCII_USTRING(INFO_CHARSET);
-DECLARE_CONSTASCII_USTRING(INFO_TEXTFILEHEADER);
-DECLARE_CONSTASCII_USTRING(INFO_FIELDDELIMITER);
-DECLARE_CONSTASCII_USTRING(INFO_TEXTDELIMITER);
-DECLARE_CONSTASCII_USTRING(INFO_DECIMALDELIMITER);
-DECLARE_CONSTASCII_USTRING(INFO_THOUSANDSDELIMITER);
-DECLARE_CONSTASCII_USTRING(INFO_SHOWDELETEDROWS);
-DECLARE_CONSTASCII_USTRING(INFO_ALLOWLONGTABLENAMES);
-DECLARE_CONSTASCII_USTRING(INFO_ADDITIONALOPTIONS);
-DECLARE_CONSTASCII_USTRING(INFO_AUTORETRIEVEVALUE);
-DECLARE_CONSTASCII_USTRING(INFO_AUTORETRIEVEENABLED);
-DECLARE_CONSTASCII_USTRING(INFO_APPEND_TABLE_ALIAS);
-DECLARE_CONSTASCII_USTRING(INFO_AS_BEFORE_CORRELATION_NAME);
-DECLARE_CONSTASCII_USTRING(INFO_FORMS_CHECK_REQUIRED_FIELDS);
-DECLARE_CONSTASCII_USTRING(INFO_PARAMETERNAMESUBST);
-DECLARE_CONSTASCII_USTRING(INFO_IGNOREDRIVER_PRIV);
-DECLARE_CONSTASCII_USTRING(INFO_USECATALOG);
-DECLARE_CONSTASCII_USTRING(INFO_CONN_LDAP_BASEDN);
-DECLARE_CONSTASCII_USTRING(INFO_CONN_LDAP_ROWCOUNT);
-DECLARE_CONSTASCII_USTRING(INFO_PREVIEW);
-DECLARE_CONSTASCII_USTRING(INFO_MEDIATYPE);
-DECLARE_CONSTASCII_USTRING(INFO_ESCAPE_DATETIME);
-
-// other
-DECLARE_CONSTASCII_USTRING(INFO_POOLURL);
-DECLARE_CONSTASCII_USTRING(URL_INTERACTIVE);
-
-
#endif // _DBASHARED_STRINGCONSTANTS_HRC_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc
index e72c373..3148c77 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/source/inc/stringconstants.inc
@@ -21,228 +21,228 @@
//============================================================
//= 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");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SINGLESELECTQUERYCOMPOSER,"SingleSelectQueryComposer");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHANGE_NOTIFICATION_ENABLED, "PropertyChangeNotificationEnabled");
+#define PROPERTY_URL "URL"
+#define PROPERTY_INFO "Info"
+#define PROPERTY_SETTINGS "Settings"
+#define PROPERTY_ISPASSWORDREQUIRED "IsPasswordRequired"
+#define PROPERTY_TABLEFILTER "TableFilter"
+#define PROPERTY_TABLETYPEFILTER "TableTypeFilter"
+#define PROPERTY_NAME "Name"
+#define PROPERTY_SCHEMANAME "SchemaName"
+#define PROPERTY_CATALOGNAME "CatalogName"
+#define PROPERTY_PRIVILEGES "Privileges"
+#define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing"
+#define PROPERTY_COMMAND "Command"
+#define PROPERTY_TYPE "Type"
+#define PROPERTY_TYPENAME "TypeName"
+#define PROPERTY_PRECISION "Precision"
+#define PROPERTY_SCALE "Scale"
+#define PROPERTY_ISNULLABLE "IsNullable"
+#define PROPERTY_ISAUTOINCREMENT "IsAutoIncrement"
+#define PROPERTY_ISROWVERSION "IsRowVersion"
+#define PROPERTY_DESCRIPTION "Description"
+#define PROPERTY_DEFAULTVALUE "DefaultValue"
+#define PROPERTY_NUMBERFORMAT "FormatKey"
+#define PROPERTY_QUERYTIMEOUT "QueryTimeOut"
+#define PROPERTY_MAXFIELDSIZE "MaxFieldSize"
+#define PROPERTY_MAXROWS "MaxRows"
+#define PROPERTY_CURSORNAME "CursorName"
+#define PROPERTY_RESULTSETCONCURRENCY "ResultSetConcurrency"
+#define PROPERTY_RESULTSETTYPE "ResultSetType"
+#define PROPERTY_FETCHDIRECTION "FetchDirection"
+#define PROPERTY_FETCHSIZE "FetchSize"
+#define PROPERTY_USEBOOKMARKS "UseBookmarks"
+#define PROPERTY_ISSEARCHABLE "IsSearchable"
+#define PROPERTY_ISCURRENCY "IsCurrency"
+#define PROPERTY_ISSIGNED "IsSigned"
+#define PROPERTY_DISPLAYSIZE "DisplaySize"
+#define PROPERTY_LABEL "Label"
+#define PROPERTY_ISREADONLY "IsReadOnly"
+#define PROPERTY_ISWRITABLE "IsWritable"
+#define PROPERTY_ISDEFINITELYWRITABLE "IsDefinitelyWritable"
+#define PROPERTY_VALUE "Value"
+#define PROPERTY_TABLENAME "TableName"
+#define PROPERTY_ISCASESENSITIVE "IsCaseSensitive"
+#define PROPERTY_SERVICENAME "ServiceName"
+#define PROPERTY_ISBOOKMARKABLE "IsBookmarkable"
+#define PROPERTY_CANUPDATEINSERTEDROWS "CanUpdateInsertedRows"
+#define PROPERTY_ISSET "IsSet"
+#define PROPERTY_ISOUTPARAMETER "IsOutParameter"
+#define PROPERTY_NUMBERFORMATSSUPPLIER "NumberFormatsSupplier"
+#define PROPERTY_ISCALCULATED "IsCalculated"
+#define PROPERTY_DATASOURCENAME "DataSourceName"
+#define PROPERTY_DATABASE_LOCATION "DatabaseLocation"
+#define PROPERTY_CONNECTION_RESOURCE "ConnectionResource"
+#define PROPERTY_CONNECTION_INFO "ConnectionInfo"
+#define PROPERTY_RESULT_SET "ResultSet"
+#define PROPERTY_SELECTION "Selection"
+#define PROPERTY_BOOKMARK_SELECTION "BookmarkSelection"
+#define PROPERTY_COLUMN_NAME "ColumnName"
+#define PROPERTY_COLUMN "Column"
+#define PROPERTY_DATASOURCE "DataSource"
+#define PROPERTY_TRANSACTIONISOLATION "TransactionIsolation"
+#define PROPERTY_TYPEMAP "TypeMap"
+#define PROPERTY_USER "User"
+#define PROPERTY_PASSWORD "Password"
+#define PROPERTY_COMMAND_TYPE "CommandType"
+#define PROPERTY_ACTIVECOMMAND "ActiveCommand"
+#define PROPERTY_ACTIVE_CONNECTION "ActiveConnection"
+#define PROPERTY_FILTER "Filter"
+#define PROPERTY_APPLYFILTER "ApplyFilter"
+#define PROPERTY_ORDER "Order"
+#define PROPERTY_APPLYORDER "ApplyOrder"
+#define PROPERTY_ISMODIFIED "IsModified"
+#define PROPERTY_ISNEW "IsNew"
+#define PROPERTY_ROWCOUNT "RowCount"
+#define PROPERTY_ISROWCOUNTFINAL "IsRowCountFinal"
+#define PROPERTY_HELPFILENAME "HelpFileName"
+#define PROPERTY_WIDTH "Width"
+#define PROPERTY_ROW_HEIGHT "RowHeight"
+#define PROPERTY_FORMATKEY "FormatKey"
+#define PROPERTY_ALIGN "Align"
+#define PROPERTY_FONT "FontDescriptor"
+#define PROPERTY_TEXTCOLOR "TextColor"
+#define PROPERTY_BOUNDFIELD "BoundField"
+#define PROPERTY_CONTROLSOURCE "DataField"
+#define PROPERTY_REALNAME "RealName"
+#define PROPERTY_ISHIDDEN "IsHidden"
+#define PROPERTY_UPDATE_TABLENAME "UpdateTableName"
+#define PROPERTY_UPDATE_SCHEMANAME "UpdateSchemaName"
+#define PROPERTY_UPDATE_CATALOGNAME "UpdateCatalogName"
+#define PROPERTY_RELATIVEPOSITION "RelativePosition"
+#define PROPERTY_CONTROLMODEL "ControlModel"
+#define PROPERTY_ISASCENDING "IsAscending"
+#define PROPERTY_RELATEDCOLUMN "RelatedColumn"
+#define PROPERTY_ISUNIQUE "IsUnique"
+#define PROPERTY_ISPRIMARYKEYINDEX "IsPrimaryKeyIndex"
+#define PROPERTY_IGNORERESULT "IgnoreResult"
+#define PROPERTY_UPDATERULE "UpdateRule"
+#define PROPERTY_DELETERULE "DeleteRule"
+#define PROPERTY_REFERENCEDTABLE "ReferencedTable"
+#define PROPERTY_REFERENCEDCOLUMN "ReferencedColumn"
+#define PROPERTY_PARENTWINDOW "ParentWindow"
+#define PROPERTY_SQLEXCEPTION "SQLException"
+#define PROPERTY_BORDER "Border"
+#define PROPERTY_THREADSAFE "ThreadSafe"
+#define PROPERTY_HELPTEXT "HelpText"
+#define PROPERTY_CONTROLDEFAULT "ControlDefault"
+#define PROPERTY_HIDDEN "Hidden"
+#define PROPERTY_DEFAULTSTATE "DefaultState"
+#define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns"
+#define PROPERTY_SHOW_BROWSER "ShowBrowser"
+#define PROPERTY_ENABLE_BROWSER "EnableBrowser"
+#define PROPERTY_SHOWMENU "ShowMenu"
+#define PROPERTY_LAYOUTINFORMATION "LayoutInformation"
+#define PROPERTY_CURRENTTABLE "CurrentTable"
+#define PROPERTY_DATABASENAME "DatabaseName"
+#define PROPERTY_CONTROLUSER "ControlUser"
+#define PROPERTY_CONTROLPASSWORD "ControlPassword"
+#define PROPERTY_CACHESIZE "CacheSize"
+#define PROPERTY_TEXTLINECOLOR "TextLineColor"
+#define PROPERTY_TEXTEMPHASIS "FontEmphasisMark"
+#define PROPERTY_TEXTRELIEF "FontRelief"
+#define PROPERTY_DEFAULTTEXT "DefaultText"
+#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault"
+#define PROPERTY_AUTOINCREMENTCREATION "AutoIncrementCreation"
+#define PROPERTY_BOOLEANCOMPARISONMODE "BooleanComparisonMode"
+#define PROPERTY_ENABLESQL92CHECK "EnableSQL92Check"
+#define PROPERTY_FONTCHARWIDTH "FontCharWidth"
+#define PROPERTY_FONTCHARSET "FontCharset"
+#define PROPERTY_FONTFAMILY "FontFamily"
+#define PROPERTY_FONTHEIGHT "FontHeight"
+#define PROPERTY_FONTKERNING "FontKerning"
+#define PROPERTY_FONTNAME "FontName"
+#define PROPERTY_FONTORIENTATION "FontOrientation"
+#define PROPERTY_FONTPITCH "FontPitch"
+#define PROPERTY_FONTSLANT "FontSlant"
+#define PROPERTY_FONTSTRIKEOUT "FontStrikeout"
+#define PROPERTY_FONTSTYLENAME "FontStyleName"
+#define PROPERTY_FONTUNDERLINE "FontUnderline"
+#define PROPERTY_FONTWEIGHT "FontWeight"
+#define PROPERTY_FONTWIDTH "FontWidth"
+#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
+#define PROPERTY_FONTTYPE "FontType"
+#define PROPERTY_PERSISTENT_NAME "PersistentName"
+#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject"
+#define PROPERTY_ORIGINAL "Original"
+#define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect"
+#define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect"
+#define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape"
+#define PROPERTY_AS_TEMPLATE "AsTemplate"
+#define PROPERTY_HAVING_CLAUSE "HavingClause"
+#define PROPERTY_GROUP_BY "GroupBy"
+#define PROPERTY_EDIT_WIDTH "EditWidth"
+#define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer"
+#define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled"
//============================================================
//= 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_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_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_SDBCX_INDEXCOLUMN, "com.sun.star.sdbcx.IndexColumn");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN, "com.sun.star.sdbcx.KeyColumn");
-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");
+#define SERVICE_SDBC_RESULTSET "com.sun.star.sdbc.ResultSet"
+#define SERVICE_SDBC_ROWSET "com.sun.star.sdbc.RowSet"
+#define SERVICE_SDBC_STATEMENT "com.sun.star.sdbc.Statement"
+#define SERVICE_SDBC_PREPAREDSTATEMENT "com.sun.star.sdbc.PreparedStatement"
+#define SERVICE_SDBC_CALLABLESTATEMENT "com.sun.star.sdbc.CallableStatement"
+#define SERVICE_SDBC_CONNECTION "com.sun.star.sdbc.Connection"
+#define SERVICE_SDBCX_CONTAINER "com.sun.star.sdbcx.Container"
+#define SERVICE_SDBCX_TABLE "com.sun.star.sdbcx.Table"
+#define SERVICE_SDBCX_RESULTSET "com.sun.star.sdbcx.ResultSet"
+#define SERVICE_SDB_CONNECTION "com.sun.star.sdb.Connection"
+#define SERVICE_SDBCX_COLUMN "com.sun.star.sdbcx.Column"
+#define SERVICE_SDBCX_COLUMNDESCRIPTOR "com.sun.star.sdbcx.ColumnDescriptor"
+#define SERVICE_SDB_COLUMNSETTINGS "com.sun.star.sdb.ColumnSettings"
+#define SERVICE_SDB_RESULTCOLUMN "com.sun.star.sdb.ResultColumn"
+#define SERVICE_SDB_DATACOLUMN "com.sun.star.sdb.DataColumn"
+#define SERVICE_SDB_DATASOURCE "com.sun.star.sdb.DataSource"
+#define SERVICE_SDB_RESULTSET "com.sun.star.sdb.ResultSet"
+#define SERVICE_SDB_ROWSET "com.sun.star.sdb.RowSet"
+#define SERVICE_SDB_PREPAREDSTATMENT "com.sun.star.sdb.PreparedStatement"
+#define SERVICE_SDB_CALLABLESTATEMENT "com.sun.star.sdbc.CallableStatement"
+#define SERVICE_SDB_SQLQUERYCOMPOSER "com.sun.star.sdb.SQLQueryComposer"
+#define SERVICE_SDB_DATASETTINGS "com.sun.star.sdb.DefinitionSettings"
+#define SERVICE_SDB_QUERYDESCRIPTOR "com.sun.star.sdb.QueryDescriptor"
+#define SERVICE_SDB_QUERY "com.sun.star.sdb.Query"
+#define SERVICE_SDBCX_COLUMNS "com.sun.star.sdbcx.Columns"
+#define SERVICE_SDBCX_TABLES "com.sun.star.sdbcx.Tables"
+#define SERVICE_SDB_QUERIES "com.sun.star.sdb.Queries"
+#define SERVICE_SDBCX_INDEXCOLUMN "com.sun.star.sdbcx.IndexColumn"
+#define SERVICE_SDBCX_KEYCOLUMN "com.sun.star.sdbcx.KeyColumn"
+#define SERVICE_SDB_DOCUMENTDEFINITION "com.sun.star.sdb.DocumentDefinition"
+#define SERVICE_NAME_FORM "com.sun.star.sdb.Form"
+#define SERVICE_NAME_FORM_COLLECTION "com.sun.star.sdb.Forms"
+#define SERVICE_NAME_REPORT "com.sun.star.sdb.Report"
+#define SERVICE_NAME_REPORT_COLLECTION "com.sun.star.sdb.Reports"
+#define SERVICE_NAME_QUERY_COLLECTION "com.sun.star.sdb.Queries"
+#define SERVICE_NAME_TABLE_COLLECTION "com.sun.star.sdb.Tables"
+#define SERVICE_NAME_SINGLESELECTQUERYCOMPOSER "com.sun.star.sdb.SingleSelectQueryComposer"
+#define 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");
-IMPLEMENT_CONSTASCII_USTRING(INFO_ESCAPE_DATETIME,"EscapeDateTime");
+#define INFO_JDBCDRIVERCLASS "JavaDriverClass"
+#define INFO_TEXTFILEEXTENSION "Extension"
+#define INFO_CHARSET "CharSet"
+#define INFO_TEXTFILEHEADER "HeaderLine"
+#define INFO_FIELDDELIMITER "FieldDelimiter"
+#define INFO_TEXTDELIMITER "StringDelimiter"
+#define INFO_DECIMALDELIMITER "DecimalDelimiter"
+#define INFO_THOUSANDSDELIMITER "ThousandDelimiter"
+#define INFO_SHOWDELETEDROWS "ShowDeleted"
+#define INFO_ALLOWLONGTABLENAMES "NoNameLengthLimit"
+#define INFO_ADDITIONALOPTIONS "SystemDriverSettings"
+#define INFO_AUTORETRIEVEVALUE "AutoRetrievingStatement"
+#define INFO_AUTORETRIEVEENABLED "IsAutoRetrievingEnabled"
+#define INFO_APPEND_TABLE_ALIAS "AppendTableAliasName"
+#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName"
+#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields"
+#define INFO_PARAMETERNAMESUBST "ParameterNameSubstitution"
+#define INFO_IGNOREDRIVER_PRIV "IgnoreDriverPrivileges"
+#define INFO_USECATALOG "UseCatalog"
+#define INFO_CONN_LDAP_BASEDN "BaseDN"
+#define INFO_CONN_LDAP_ROWCOUNT "MaxRowCount"
+#define INFO_PREVIEW "Preview"
+#define INFO_MEDIATYPE "MediaType"
+#define INFO_ESCAPE_DATETIME "EscapeDateTime"
// other
-IMPLEMENT_CONSTASCII_USTRING(INFO_POOLURL,"PoolURL");
-IMPLEMENT_CONSTASCII_USTRING(URL_INTERACTIVE,"Interactive");
+#define INFO_POOLURL "PoolURL"
+#define URL_INTERACTIVE "Interactive"
diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc
index 6b6202f..b896a92 100644
--- a/dbaccess/source/inc/xmlstrings.hrc
+++ b/dbaccess/source/inc/xmlstrings.hrc
@@ -20,19 +20,11 @@
#define DBACCESS_SHARED_XMLSTRINGS_HRC
#include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
-using comphelper::string::ConstAsciiString;
-namespace dbaxml
-{
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-
- //============================================================
- //= XML
- //============================================================
-}
+#include "stringconstants.inc"
#endif // DBACCESS_SHARED_XMLSTRINGS_HRC
diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx
deleted file mode 100644
index d697ce5..0000000
--- a/dbaccess/source/shared/dbustrings.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dbustrings.hrc"
-
-namespace dbaui
-{
-
-#include "stringconstants.inc"
-
- //============================================================
- //= URLs
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_QUERYDESIGN, ".component:DB/QueryDesign");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_VIEWDESIGN, ".component:DB/ViewDesign");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_TABLEDESIGN, ".component:DB/TableDesign");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_FORMGRIDVIEW, ".component:DB/FormGridView");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_DATASOURCEBROWSER, ".component:DB/DataSourceBrowser");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN, ".component:DB/RelationDesign");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_APPLICATION, ".component:DB/Application");
- IMPLEMENT_CONSTASCII_USTRING(URL_COMPONENT_REPORTDESIGN, ".component:DB/ReportDesign");
-
- //============================================================
- //= service names
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog");
-
- //============================================================
- //= other
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview");
- IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW, "QueryDesignView");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GRAPHICAL_DESIGN, "GraphicalDesign");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELP_URL, "HelpURL");
-
- //============================================================
- //= properties
- //============================================================
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape");
-
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "TabStop");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL, "DefaultControl");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED, "Enabled");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MOUSE_WHEEL_BEHAVIOR, "MouseWheelBehavior");
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 53b6555..2f49883 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2727,7 +2727,7 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel >
const OUString aPropertyNames[] =
{
- PROPERTY_URL, PROPERTY_USER
+ OUString(PROPERTY_URL), OUString(PROPERTY_USER)
};
// disconnect from old model
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 7e0383e..23845e0 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -191,12 +191,12 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
{
}
} aImplementations[] = {
- ServiceNameToImplName( URL_COMPONENT_FORMGRIDVIEW.ascii, "org.openoffice.comp.dbu.OFormGridView" ),
- ServiceNameToImplName( URL_COMPONENT_DATASOURCEBROWSER.ascii, "org.openoffice.comp.dbu.ODatasourceBrowser" ),
- ServiceNameToImplName( URL_COMPONENT_QUERYDESIGN.ascii, "org.openoffice.comp.dbu.OQueryDesign" ),
- ServiceNameToImplName( URL_COMPONENT_TABLEDESIGN.ascii, "org.openoffice.comp.dbu.OTableDesign" ),
- ServiceNameToImplName( URL_COMPONENT_RELATIONDESIGN.ascii, "org.openoffice.comp.dbu.ORelationDesign" ),
- ServiceNameToImplName( URL_COMPONENT_VIEWDESIGN.ascii, "org.openoffice.comp.dbu.OViewDesign" )
+ ServiceNameToImplName( URL_COMPONENT_FORMGRIDVIEW, "org.openoffice.comp.dbu.OFormGridView" ),
+ ServiceNameToImplName( URL_COMPONENT_DATASOURCEBROWSER, "org.openoffice.comp.dbu.ODatasourceBrowser" ),
+ ServiceNameToImplName( URL_COMPONENT_QUERYDESIGN, "org.openoffice.comp.dbu.OQueryDesign" ),
+ ServiceNameToImplName( URL_COMPONENT_TABLEDESIGN, "org.openoffice.comp.dbu.OTableDesign" ),
+ ServiceNameToImplName( URL_COMPONENT_RELATIONDESIGN, "org.openoffice.comp.dbu.ORelationDesign" ),
+ ServiceNameToImplName( URL_COMPONENT_VIEWDESIGN, "org.openoffice.comp.dbu.OViewDesign" )
};
INetURLObject aParser( rURL );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 4a8eb5a..d7994ba 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -570,10 +570,10 @@ sal_Bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > &
const OUString aTransferProperties[] =
{
- PROPERTY_APPLYFILTER,
- PROPERTY_FILTER,
- PROPERTY_HAVING_CLAUSE,
- PROPERTY_ORDER
+ OUString(PROPERTY_APPLYFILTER),
+ OUString(PROPERTY_FILTER),
+ OUString(PROPERTY_HAVING_CLAUSE),
+ OUString(PROPERTY_ORDER)
};
for (size_t i = 0; i < SAL_N_ELEMENTS(aTransferProperties); ++i)
{
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 1423ee1..cd284de 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -73,6 +73,7 @@
#include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 41633e2..2aeae40 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1032,18 +1032,18 @@ void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId
// check if SQL92 name checking is enabled
sal_Bool isSQL92CheckEnabled(const Reference<XConnection>& _xConnection)
{
- return ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_ENABLESQL92CHECK.ascii );
+ return ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_ENABLESQL92CHECK );
}
// -----------------------------------------------------------------------------
sal_Bool isAppendTableAliasEnabled(const Reference<XConnection>& _xConnection)
{
- return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_APPEND_TABLE_ALIAS.ascii );
+ return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_APPEND_TABLE_ALIAS );
}
// -----------------------------------------------------------------------------
sal_Bool generateAsBeforeTableAlias(const Reference<XConnection>& _xConnection)
{
- return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_AS_BEFORE_CORRELATION_NAME.ascii );
+ return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_AS_BEFORE_CORRELATION_NAME );
}
// -----------------------------------------------------------------------------
@@ -1497,7 +1497,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon
aValue.Value <<= _xContent;
aArguments[2] <<= aValue;
- OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION);
+ OUString sServiceName(_bCollection ? ((_bForm) ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION)) : OUString(SERVICE_SDB_DOCUMENTDEFINITION));
Reference<XContent > xNew( xORB->createInstanceWithArguments( sServiceName, aArguments ), UNO_QUERY_THROW );
Reference< XNameContainer > xNameContainer( xNameAccess, UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 01d8ba6..63473f2 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -156,7 +156,7 @@ bool ObjectCopySource::isView() const
void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObject ) const
{
const OUString aCopyProperties[] = {
- PROPERTY_FONT, PROPERTY_ROW_HEIGHT, PROPERTY_TEXTCOLOR,PROPERTY_TEXTLINECOLOR,PROPERTY_TEXTEMPHASIS,PROPERTY_TEXTRELIEF
+ OUString(PROPERTY_FONT), OUString(PROPERTY_ROW_HEIGHT), OUString(PROPERTY_TEXTCOLOR),OUString(PROPERTY_TEXTLINECOLOR),OUString(PROPERTY_TEXTEMPHASIS),OUString(PROPERTY_TEXTRELIEF)
};
for ( size_t i=0; i < sizeof( aCopyProperties ) / sizeof( aCopyProperties[0] ); ++i )
{
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 6f2419d..7c90c33 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -187,7 +187,7 @@ namespace dbaui
//----------------------------------------------------------------------
QueryDesigner::QueryDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication,
const Reference< XFrame >& _rxParentFrame, bool _bCreateView )
- :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, _bCreateView ? URL_COMPONENT_VIEWDESIGN : URL_COMPONENT_QUERYDESIGN )
+ :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, _bCreateView ? OUString(URL_COMPONENT_VIEWDESIGN) : OUString(URL_COMPONENT_QUERYDESIGN) )
,m_nCommandType( _bCreateView ? CommandType::TABLE : CommandType::QUERY )
{
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 636d005..6f37036 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1076,7 +1076,7 @@ namespace
aMulti.insert(::std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first));
}
- const sal_Bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE.ascii );
+ const sal_Bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE );
::std::multimap<sal_Int32 , OTableWindow*>::reverse_iterator aRIter = aMulti.rbegin();
::std::multimap<sal_Int32 , OTableWindow*>::reverse_iterator aREnd = aMulti.rend();
for(;aRIter != aREnd;++aRIter)
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 62d3425..183c3f2 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -44,7 +44,7 @@ OColumnControl::OColumnControl(const Reference<XComponentContext>& rxContext)
{
}
// -----------------------------------------------------------------------------
-IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT.ascii)
+IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT)
IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl)
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl")
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 8fa2b38..62e90f7 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -116,12 +116,12 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value)
{
SolarMutexGuard aGuard;
- if (_rPropertyName.equalsAsciiL(PROPERTY_COLUMN.ascii, PROPERTY_COLUMN.length) )
+ if (_rPropertyName == PROPERTY_COLUMN)
{
Reference<XPropertySet> xProp(Value,UNO_QUERY);
setColumn(xProp);
}
- else if (_rPropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length) )
+ else if (_rPropertyName == PROPERTY_ACTIVE_CONNECTION)
{
Reference<XConnection> xCon(Value,UNO_QUERY);
setConnection(xCon);
@@ -134,11 +134,11 @@ Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc
{
Any aProp;
OFieldDescControl* pFieldControl = static_cast<OFieldDescControl*>( GetWindow() );
- if (pFieldControl && _rPropertyName.equalsAsciiL(PROPERTY_COLUMN.ascii, PROPERTY_COLUMN.length))
+ if (pFieldControl && _rPropertyName == PROPERTY_COLUMN)
{
aProp <<= m_xColumn;
}
- else if (pFieldControl && _rPropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length))
+ else if (pFieldControl && _rPropertyName == PROPERTY_ACTIVE_CONNECTION)
{
aProp <<= pFieldControl->getConnection();
}
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index b6a3b0d..1b31906 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -44,8 +44,8 @@ namespace dbaui
#define PROPERTY_ID_QUERYCOMPOSER 100
#define PROPERTY_ID_ROWSET 101
- IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" );
- IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" );
+#define PROPERTY_QUERYCOMPOSER "QueryComposer"
+#define PROPERTY_ROWSET "RowSet"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 385b704..7af883e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -743,7 +743,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
OUString sUnsupportedSetting;
const OUString aSettings[] = {
- PROPERTY_FILTER, PROPERTY_ORDER, PROPERTY_HAVING_CLAUSE, PROPERTY_GROUP_BY
+ OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER), OUString(PROPERTY_HAVING_CLAUSE), OUString(PROPERTY_GROUP_BY)
};
for ( size_t i=0; i < sizeof( aSettings ) / sizeof( aSettings[0] ); ++i )
{
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index b32a2d3..c3e9426 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -74,7 +74,7 @@ DBG_NAME(ODirectSQLDialog)
//---------------------------------------------------------------------
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODirectSQLDialog, "com.sun.star.comp.sdb.DirectSQLDialog")
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODirectSQLDialog)
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG.ascii)
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG)
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL ODirectSQLDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB)
More information about the Libreoffice-commits
mailing list