From 07b6f64da964de40f01d2d55ed5563793602b749 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 10 Jul 2006 13:47:20 +0000 Subject: INTEGRATION: CWS qiq (1.43.18); FILE MERGED 2006/06/27 11:01:36 fs 1.43.18.2: RESYNC: (1.43-1.44); FILE MERGED 2006/05/23 13:57:31 fs 1.43.18.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# --- forms/source/component/ListBox.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'forms') diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 068dad295a3c..deeb2c2c167f 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ListBox.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:52:12 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:47:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -787,9 +787,10 @@ namespace frm aStatement += quoteName(aQuote, aBoundFieldName); } 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, sListSource,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + + ::rtl::OUString sCatalog, sSchema, sTable; + qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation ); + aStatement += composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable ); xContentSetProperties->setPropertyValue(PROPERTY_COMMAND, makeAny(aStatement)); bExecute = sal_True; -- cgit v1.2.3