User: obo Date: 2006/07/10 08:33:17 Modified: dba/dbaccess/source/ui/inc/querycontroller.hxx
Log: INTEGRATION: CWS qiq (1.32.124); FILE MERGED 2006/05/17 04:30:48 fs 1.32.124.3: #i51143# changed signature of OSQLParseTreeIterator 2006/05/12 13:47:01 fs 1.32.124.2: #i51143# refactoring of controller initialization, which allows accessing the load arguments even during Construct (and not only in the - later - impl_initialize) 2006/05/12 11:09:55 fs 1.32.124.1: #i51143# +allowViews/+allowQueries File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: querycontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/querycontroller.hxx?r1=1.32&r2=1.33 Delta lines: +9 -5 ------------------- --- querycontroller.hxx 8 Sep 2005 16:00:38 -0000 1.32 +++ querycontroller.hxx 10 Jul 2006 15:33:14 -0000 1.33 @@ -98,8 +98,8 @@ OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria ::svxform::OSystemParseContext* m_pParseContext; - ::connectivity::OSQLParser* m_pSqlParser; // to parse sql statements - ::connectivity::OSQLParseTreeIterator* m_pSqlIterator; // to iterate through them + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator* m_pSqlIterator; ::std::vector<sal_uInt32> m_vColumnWidth; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; @@ -173,7 +173,7 @@ void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} void setVisibleRows(sal_Int32 _nVisibleRows) { m_nVisibleRows = _nVisibleRows;} - ::connectivity::OSQLParser* getParser() { return m_pSqlParser; } + ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } sal_uInt32 getColWidth(sal_uInt16 _nPos) const { @@ -206,12 +206,16 @@ // ask the user if the design should be saved when it is modified virtual short saveModified(); virtual void reset(); - virtual void impl_initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); + virtual void impl_initialize(); void resetImpl(); /// sets m_sStatement, and notifies our respective property change listeners void setStatement_fireEvent( const ::rtl::OUString& _rNewStatement, bool _bFireStatementChange = true ); + + // OJoinController overridables + virtual bool allowViews() const; + virtual bool allowQueries() const; private: DECL_LINK( OnExecuteAddTable, void* ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
