User: kz Date: 2006/10/05 06:00:54 Modified: dba/dbaccess/source/ui/app/AppDetailView.hxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.12.14); FILE MERGED 2006/09/20 19:29:05 fs 1.12.14.2: #i10000# 2006/09/20 11:43:55 fs 1.12.14.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.hxx?r1=1.12&r2=1.13 Delta lines: +8 -21 -------------------- --- AppDetailView.hxx 28 Aug 2006 15:06:13 -0000 1.12 +++ AppDetailView.hxx 5 Oct 2006 13:00:52 -0000 1.13 @@ -160,14 +160,14 @@ Splitter m_aHorzSplitter; OTitleWindow m_aTasks; OTitleWindow m_aContainer; - OAppBorderWindow* m_pBorderWin; // my parent + OAppBorderWindow& m_rBorderWin; // my parent OAppDetailPageHelper* m_pControlHelper; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); public: - OApplicationDetailView(OAppBorderWindow* _pParent,PreviewMode _ePreviewMode); + OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); // window overloads // virtual void Resize(); @@ -187,7 +187,7 @@ */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); - inline OAppBorderWindow* getBorderWin() const { return m_pBorderWin;} + inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin;} sal_Bool isCutAllowed() ; sal_Bool isCopyAllowed() ; sal_Bool isPasteAllowed(); @@ -200,13 +200,10 @@ @param _pEntry The entry of a table, or query, form, report to get the qualified name. If the entry is <NULL/>, the first selected is chosen. - @param _xMetaData - The meta data are used to create the table name, otherwise this may also be <NULL/> @return the qualified name */ - ::rtl::OUString getQualifiedName(SvLBoxEntry* _pEntry - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData) const; + ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -256,11 +253,8 @@ /** returns the element names which are selected @param _rNames The list will be filled. - @param _xMetaData - Will be used when the table list should be filled. */ - void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData = NULL) const; + void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; /** adds a new object to the detail page. @param _eType @@ -274,8 +268,7 @@ */ SvLBoxEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL); + ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -291,9 +284,7 @@ */ void elementReplaced(ElementType eType ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = NULL - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xObject = NULL); + ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -304,8 +295,7 @@ If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); + ,const ::rtl::OUString& _rName ); /// returns the preview mode PreviewMode getPreviewMode(); @@ -331,8 +321,6 @@ /** shows the Preview of a table or query @param _sDataSourceName the name of the data source - @param _xConnection - the connection which will be shared @param _sName the name of table or query @param _bTable @@ -340,7 +328,6 @@ @return void */ void showPreview( const ::rtl::OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
