User: obo Date: 2006/07/10 08:29:40 Modified: dba/dbaccess/source/ui/inc/TableWindow.hxx
Log: INTEGRATION: CWS qiq (1.13.122); FILE MERGED 2006/07/03 19:47:59 fs 1.13.122.3: #i51143# don't allow to add queries to the designer which do not produce a result set 2006/06/27 12:37:44 fs 1.13.122.2: RESYNC: (1.13-1.14); FILE MERGED 2006/05/10 10:56:58 fs 1.13.122.1: #i51143# allow to hold a query, not only a table File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: TableWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TableWindow.hxx?r1=1.14&r2=1.15 Delta lines: +28 -6 -------------------- --- TableWindow.hxx 20 Jun 2006 03:14:23 -0000 1.14 +++ TableWindow.hxx 10 Jul 2006 15:29:38 -0000 1.15 @@ -89,8 +89,8 @@ private: // the columns of the table - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xTable; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTableOrQuery; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; OTableWindowData* m_pData; ::rtl::OUString m_strInitialWinName; @@ -98,6 +98,7 @@ sal_Int32 m_nMoveIncrement; // how many pixel we should move UINT16 m_nSizingFlags; BOOL m_bActive; + bool m_bIsQuery; void Draw3DBorder( const Rectangle& rRect ); @@ -143,7 +144,17 @@ ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); - OTableWindow( Window* pParent, OTableWindowData* pTabWinData); + /** determines whether the classes Init method should accept a query name, or only table names + */ + virtual bool allowQueries() const = 0; + + /** called when Init fails because the m_xTableOrQuery object could not provide columns, but no + exception was thrown. Expected to throw. + */ + virtual void onNoColumns_throw(); + + OTableWindow( Window* pParent, OTableWindowData* pTabWinData ); + public: TYPEINFO(); @@ -179,8 +190,19 @@ The composed name or the window name. */ virtual ::rtl::OUString GetName() const = 0; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> GetOriginalColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> GetTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } + + inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + GetOriginalColumns() const + { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } + + inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + GetTableOrQuery() const + { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTableOrQuery; } + + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + GetTable() const; + + inline bool isQuery() const { return m_bIsQuery; } UINT16 GetSizingFlags() const { return m_nSizingFlags; } /** set the sizing flag to the direction @@ -210,7 +232,7 @@ // habe ich Connections nach aussen ? BOOL ExistsAConn() const; - virtual void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields); + void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields); // OEventListenerAdapter virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
