diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:53:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:53:20 +0000 |
| commit | a435a54ae86ce34d10a9b3a769e7df03ff8ff08a (patch) | |
| tree | 0756c3a52d64ae672bb309c31df6ca2db57b67dd /extensions/source/dbpilots/listcombowizard.cxx | |
| parent | 70b604e4e216eae9c3adb67a5adae07ede3f6821 (diff) | |
INTEGRATION: CWS qiq (1.16.146); FILE MERGED
2006/05/29 09:27:55 fs 1.16.146.1: quoteTableName and friends changed during #i51143#
Diffstat (limited to 'extensions/source/dbpilots/listcombowizard.cxx')
| -rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 9238350923da..7740c9dfe063 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: listcombowizard.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:31:26 $ + * last change: $Author: obo $ $Date: 2006-07-10 15:53:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -207,10 +207,11 @@ namespace dbp ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString(); if (isListBox()) // only when we have a listbox this should be not empty getSettings().sLinkedListField = quoteName(sQuoteString, getSettings().sLinkedListField); - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled(xConn,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled(xConn,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); - getSettings().sListContentTable = quoteTableName(xMetaData, getSettings().sListContentTable,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + ::rtl::OUString sCatalog, sSchema, sName; + ::dbtools::qualifiedNameComponents( xMetaData, getSettings().sListContentTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); + getSettings().sListContentTable = ::dbtools::composeTableNameForSelect( xConn, sCatalog, sSchema, sName ); + getSettings().sListContentField = quoteName(sQuoteString, getSettings().sListContentField); } |