From b8a3d4fddd78b0c5d439d313ef2ef4901e424c09 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 5 Jan 2005 11:42:54 +0000 Subject: INTEGRATION: CWS dba20 (1.77.14); FILE MERGED 2004/12/13 13:29:37 oj 1.77.14.3: RESYNC: (1.79-1.80); FILE MERGED 2004/11/29 09:05:03 oj 1.77.14.2: RESYNC: (1.77-1.79); FILE MERGED 2004/11/18 10:16:43 fs 1.77.14.1: #i37070# XSQLQueryComposer superseded by XSingleSelectQueryComposer --- extensions/source/propctrlr/formcontroller.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'extensions') diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 46bfdaf707c9..c7e4a297c544 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formcontroller.cxx,v $ * - * $Revision: 1.80 $ + * $Revision: 1.81 $ * - * last change: $Author: kz $ $Date: 2004-11-26 18:26:32 $ + * last change: $Author: obo $ $Date: 2005-01-05 12:42:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,6 +111,9 @@ #ifndef _SFXAPP_HXX #include #endif +#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ +#include +#endif #ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_ #include #endif @@ -252,9 +255,6 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_ -#include -#endif #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_ #include #endif @@ -3940,7 +3940,7 @@ class EventsNameReplace_Impl: return; // get a composer for the statement which the form is currently based on - Reference< XSQLQueryComposer > xComposer = getCurrentSettingsComposer( m_xIntrospecteeAsProperty, m_xORB ); + Reference< XSingleSelectQueryComposer > xComposer = getCurrentSettingsComposer( m_xIntrospecteeAsProperty, m_xORB ); OSL_ENSURE( xComposer.is(), "OPropertyBrowserController::executeFilterOrSortDialog: could not obtain a composer!" ); if ( !xComposer.is() ) return; -- cgit v1.2.3