INTEGRATION: CWS dba20 (1.28.16); FILE MERGED

2004/11/29 09:34:30 oj 1.28.16.2: RESYNC: (1.28-1.29); FILE MERGED
2004/11/17 15:14:59 fs 1.28.16.1: #i37185# XSingleSelectQueryComposer now derived from XSingleSelectQueryAnalyzer
This commit is contained in:
Oliver Bolte 2005-01-05 11:36:10 +00:00
parent b12a32dabf
commit 8829e75db6

View file

@ -2,9 +2,9 @@
*
* $RCSfile: brwctrlr.hxx,v $
*
* $Revision: 1.29 $
* $Revision: 1.30 $
*
* last change: $Author: obo $ $Date: 2004-11-16 14:31:49 $
* last change: $Author: obo $ $Date: 2005-01-05 12:36:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -101,9 +101,6 @@
#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#endif
#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
#endif
#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#endif
@ -169,8 +166,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xParser; // for sorting 'n filtering
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser; // for sorting 'n filtering
AutoTimer m_aInvalidateClipboard; // for testing the state of the CUT/COPY/PASTE-slots
@ -230,9 +226,6 @@ namespace dbaui
const TransferableDataHelper&
getViewClipboard() const { return m_aSystemClipboard; }
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > getParser() const { return m_xParser; }
public:
SbaXDataBrowserController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM);