summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 15:28:56 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 15:28:56 +0000
commitf287e220665aada7fa7d8df783caffa9e76869f0 (patch)
tree220ce017e934c0a1bfb9abd21190d5fd28b82c5c /forms
parentbc835349c5f03247b92d02aa3c255eb52454dde3 (diff)
INTEGRATION: CWS insight01 (1.29.22); FILE MERGED
2004/07/23 12:28:24 oj 1.29.22.3: RESYNC: (1.31-1.32); FILE MERGED 2004/05/28 20:01:43 oj 1.29.22.2: RESYNC: (1.29-1.31); FILE MERGED 2004/04/23 06:21:37 oj 1.29.22.1: new switch to disable catalog and schema
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/ListBox.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index fb237ec07c40..2341d3d663c9 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ListBox.cxx,v $
*
-* $Revision: 1.32 $
+* $Revision: 1.33 $
*
-* last change: $Author: rt $ $Date: 2004-07-06 13:38:42 $
+* last change: $Author: hr $ $Date: 2004-08-02 16:28:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -751,12 +751,11 @@ namespace frm
if (xFieldsByIndex->getCount() <= nBoundColumn)
break;
- Reference<XPropertySet> xFieldAsSet;
- xFieldsByIndex->getByIndex(nBoundColumn) >>= xFieldAsSet;
+ Reference<XPropertySet> xFieldAsSet(xFieldsByIndex->getByIndex(nBoundColumn),UNO_QUERY);
xFieldAsSet->getPropertyValue(PROPERTY_NAME) >>= aBoundFieldName;
nBoundColumn = 1;
- xFieldsByIndex->getByIndex(0) >>= xFieldAsSet;
+ xFieldAsSet.set(xFieldsByIndex->getByIndex(0),UNO_QUERY);
xFieldAsSet->getPropertyValue(PROPERTY_NAME) >>= aFieldName;
}
else if (xFieldsByName.is())
@@ -815,7 +814,9 @@ namespace frm
aStatement += quoteName(aQuote, aBoundFieldName);
}
aStatement += ::rtl::OUString::createFromAscii(" FROM ");
- aStatement += quoteTableName(xMeta, sListSource,::dbtools::eInDataManipulation);
+ 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);
xContentSetProperties->setPropertyValue(PROPERTY_COMMAND, makeAny(aStatement));
bExecute = sal_True;