User: kz Date: 2006/10/05 06:00:16 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.10.16); FILE MERGED 2006/09/20 19:29:04 fs 1.10.16.2: #i10000# 2006/09/20 11:43:55 fs 1.10.16.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx?r1=1.10&r2=1.11 Delta lines: +17 -30 --------------------- --- AppDetailPageHelper.hxx 28 Aug 2006 15:05:51 -0000 1.10 +++ AppDetailPageHelper.hxx 5 Oct 2006 13:00:13 -0000 1.11 @@ -116,7 +116,7 @@ class OAppDetailPageHelper : public Window { DBTreeListBox* m_pLists[CONTROL_COUNT]; - OAppBorderWindow* m_pBorderWin; + OAppBorderWindow& m_rBorderWin; FixedLine m_aFL; ToolBox m_aTBPreview; Window m_aBorder; @@ -174,26 +174,26 @@ /** sets all HandleCallbacks @param _pTreeView The newly created DBTreeListBox - @param _nCollapsedBitmap - The collapsed bitmap resource id - @param _nCollapsedBitmap_HI - The collapsed bitmap resource id for high contrast. + @param _rImage + the resource id of the default icon + @param _rImageHC + the resource id of the default icon (HC version) @return The new tree. */ - DBTreeListBox* createTree(DBTreeListBox* _pTreeView,USHORT _nCollapsedBitmap,USHORT _nCollapsedBitmap_HI); + DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC ); /** creates the tree and sets all HandleCallbacks @param _nHelpId The help id of the control @param _nCollapsedBitmap - The collapsed bitmap resource id - @param _nCollapsedBitmap_HI - The collapsed bitmap resource id for high contrast. + The image to use for tree entries. + @param _rImageHC + The image to use in high contrast mode. @return The new tree. */ - DBTreeListBox* createSimpleTree(ULONG _nHelpId, USHORT _nCollapsedBitmap,USHORT _nCollapsedBitmap_HI); + DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); DECL_LINK( OnDeSelectHdl, SvTreeListBox* ); @@ -209,10 +209,10 @@ // click a TB slot DECL_LINK(OnDropdownClickHdl, ToolBox*); - inline OAppBorderWindow* getBorderWin() const { return m_pBorderWin; } + inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } void ImplInitSettings(); public: - OAppDetailPageHelper(Window* _pParent,OAppBorderWindow* _pBorderWin,PreviewMode _ePreviewMode); + OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); virtual ~OAppDetailPageHelper(); // window overloads @@ -263,23 +263,17 @@ /** 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; /** return the qualified name. @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; /// return the element of currently select entry ElementType getElementType() const; @@ -324,8 +318,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 @@ -339,9 +332,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 @@ -352,8 +343,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 @@ -382,8 +372,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 @@ -391,7 +379,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]
