INTEGRATION: CWS qiq (1.14.124); FILE MERGED

2006/06/30 13:27:18 fs 1.14.124.2: #i51143# protect against recusive sub queries
2006/06/16 11:47:37 fs 1.14.124.1: during #i51143#:

refactored VCollection:
- createEmptyObject now named createDescriptor
- cloneObject removed
- appendObject now returns the newly created object
  (previously done via a subsequent call to cloneObject)
This commit is contained in:
Oliver Bolte 2006-07-10 14:06:56 +00:00
parent 60a0e471b6
commit ec63dd0f7c

View file

@ -4,9 +4,9 @@
*
* $RCSfile: querydescriptor.hxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: hr $ $Date: 2006-06-20 02:40:20 $
* last change: $Author: obo $ $Date: 2006-07-10 15:06:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -134,17 +134,20 @@ protected:
// IColumnFactory
virtual OColumn* createColumn(const ::rtl::OUString& _rName) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor();
virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor );
virtual void columnDropped(const ::rtl::OUString& _sName);
virtual void columnCloned(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xClone);
// called (after some preparations) from inside refreshColumns. Never overload refreshColumns directly!
/** rebuild our columns set
clearColumns has already been called before, do <em>NOT</em> call it, again
*/
virtual void rebuildColumns( );
virtual void disposeColumns();
private:
virtual void refreshColumns();
// IRefreshableColumns overridables
virtual void refreshColumns();
};
class OQueryDescriptor : public comphelper::OMutexAndBroadcastHelper