diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:46:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:46:21 +0000 |
| commit | c01cfa303af77eb62c82e81325be0f44ad04c44c (patch) | |
| tree | 83f6036fdbbd6b420e0a7780acffc16daba7cd0f /forms/source/component/ComboBox.cxx | |
| parent | b4c38911808dc6735967f43ce493fe0ccaf17730 (diff) | |
INTEGRATION: CWS qiq (1.30.24); FILE MERGED
2006/06/27 10:54:56 fs 1.30.24.2: RESYNC: (1.30-1.31); FILE MERGED
2006/05/23 13:57:30 fs 1.30.24.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143#
Diffstat (limited to 'forms/source/component/ComboBox.cxx')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 18ab1bff8ba8..dd5d4ba8257c 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ComboBox.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:46:18 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:46:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -632,9 +632,9 @@ void OComboBoxModel::loadData() aStatement += quoteName(aQuote, aFieldName); aStatement += ::rtl::OUString::createFromAscii(" FROM "); - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); - aStatement += quoteTableName(xMeta, m_aListSource,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + ::rtl::OUString sCatalog, sSchema, sTable; + qualifiedNameComponents( xMeta, m_aListSource, sCatalog, sSchema, sTable, eInDataManipulation ); + aStatement += composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable ); xStmt = xConnection->createStatement(); xListCursor = xStmt->executeQuery(aStatement); |