diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:55:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:55:57 +0000 |
| commit | 7de663c7aeea5cb2769dc3f0b5ca045696e8dc17 (patch) | |
| tree | 178ed0c7f4f503315b656c121facabc7b2af9f72 /svx/source/fmcomp | |
| parent | d6952442ae09d64739769a6aa33b8230e8693b1d (diff) | |
INTEGRATION: CWS qiq (1.48.74); FILE MERGED
2006/06/27 12:31:51 fs 1.48.74.2: RESYNC: (1.48-1.49); FILE MERGED
2006/05/24 06:01:44 fs 1.48.74.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143#
Diffstat (limited to 'svx/source/fmcomp')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 6d2808d577ce..7e9894cd045a 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gridcell.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: hr $ $Date: 2006-06-19 15:50:16 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:55:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3013,11 +3013,6 @@ void DbFilterField::Update() if (!xTablesNames->hasByName(aTableName)) return; - // this is the tablename - Reference< ::com::sun::star::container::XNamed > xTableNameAccess; - ::cppu::extractInterface(xTableNameAccess, xTablesNames->getByName(aTableName)); - aTableName = xTableNameAccess->getName(); - // ein Statement aufbauen und abschicken als query // Access to the connection Reference< XStatement > xStatement; @@ -3040,10 +3035,9 @@ void DbFilterField::Update() } aStatement.AppendAscii(" FROM "); - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); - aStatement += quoteTableName(xMeta, aTableName,bUseCatalogInSelect,bUseSchemaInSelect).getStr(); + Reference< XPropertySet > xTableNameAccess( xTablesNames->getByName(aTableName), UNO_QUERY_THROW ); + aStatement += composeTableNameForSelect( xConnection, xTableNameAccess ).getStr(); xStatement = xConnection->createStatement(); Reference< ::com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY); |