Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/18 06:54:16 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx dba/dbaccess/source/ui/app/AppDetailView.cxx dba/dbaccess/source/ui/app/AppDetailView.hxx
Log: #i69526# AppBorderWindow held as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.15.12.3&r2=1.15.12.4 Delta lines: +32 -27 --------------------- --- AppDetailPageHelper.cxx 18 Sep 2006 12:17:04 -0000 1.15.12.3 +++ AppDetailPageHelper.cxx 18 Sep 2006 13:54:13 -0000 1.15.12.4 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.cxx,v $ * - * $Revision: 1.15.12.3 $ + * $Revision: 1.15.12.4 $ * - * last change: $Author: fs $ $Date: 2006/09/18 12:17:04 $ + * last change: $Author: fs $ $Date: 2006/09/18 13:54:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,6 +110,9 @@ #ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ #include <com/sun/star/util/XCloseable.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_APPLICATION_XDATABASEDOCUMENTUI_HPP_ +#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> +#endif #ifndef DBAUI_APPVIEW_HXX #include "AppView.hxx" #endif @@ -157,6 +160,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::form; using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdb::application; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; @@ -268,8 +272,8 @@ // class OAppDetailPageHelper DBG_NAME(OAppDetailPageHelper) //================================================================== -OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow* _pBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) - ,m_pBorderWin(_pBorderWin) +OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) + ,m_rBorderWin(_rBorderWin) ,m_aFL(this,WB_VERT) ,m_aTBPreview(this,WB_TABSTOP ) ,m_aBorder(this,WB_BORDER | WB_READONLY) @@ -289,7 +293,7 @@ m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB); m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) ); m_aTBPreview.EnableMenuStrings(); - m_aTBPreview.Enable(!m_pBorderWin->getView()->getCommandController()->isDataSourceReadOnly()); + m_aTBPreview.Enable(!m_rBorderWin.getView()->getCommandController()->isDataSourceReadOnly()); m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1); @@ -570,7 +574,7 @@ if ( !m_pLists[E_TABLE] ) { OTableTreeListBox* pTreeView = new OTableTreeListBox(this - ,getBorderWin()->getView()->getORB() + ,getBorderWin().getView()->getORB() ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP ,sal_False); pTreeView->SetHelpId(HID_APP_TABLE_TREE); @@ -683,12 +687,12 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, DBTreeListBox& _rList, USHORT _nImageId, USHORT _nHighContrastImageId, SvLBoxEntry* _pParent ) { - fillTreeListNames( _xContainer, _rList, _nImageId, _nHighContrastImageId, _pParent, m_pBorderWin->getView()->getContainerListener() ); + fillTreeListNames( _xContainer, _rList, _nImageId, _nHighContrastImageId, _pParent, m_rBorderWin.getView()->getContainerListener() ); } // ----------------------------------------------------------------------------- DBTreeListBox* OAppDetailPageHelper::createSimpleTree(ULONG _nHelpId, USHORT _nCollapsedBitmap,USHORT _nCollapsedBitmap_HI) { - DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin()->getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); + DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); pTreeView->SetHelpId(_nHelpId); return createTree(pTreeView,_nCollapsedBitmap,_nCollapsedBitmap_HI); } @@ -723,8 +727,8 @@ _pTreeView->setPasteHandler(LINK(this, OAppDetailPageHelper, OnPasteEntry)); _pTreeView->setDeleteHandler(LINK(this, OAppDetailPageHelper, OnDeleteEntry)); - _pTreeView->setContextMenuActionListener(getBorderWin()->getView()->getCommandController()); - _pTreeView->setControlActionListener(getBorderWin()->getView()->getActionListener()); + _pTreeView->setContextMenuActionListener(getBorderWin().getView()->getCommandController()); + _pTreeView->setControlActionListener(getBorderWin().getView()->getActionListener()); return _pTreeView; } @@ -872,13 +876,13 @@ // ----------------------------------------------------------------------------- IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree) { - getBorderWin()->getView()->getElementNotification()->onEntryDoubleClick(_pTree); + getBorderWin().getView()->getElementNotification()->onEntryDoubleClick(_pTree); return 1L; } // ----------------------------------------------------------------------------- IMPL_LINK(OAppDetailPageHelper, OnDeSelectHdl, SvTreeListBox*, _pTree) { - getBorderWin()->getView()->getElementNotification()->onEntryDeSelect(_pTree); + getBorderWin().getView()->getElementNotification()->onEntryDeSelect(_pTree); return 1L; } // ----------------------------------------------------------------------------- @@ -886,7 +890,7 @@ { if ( 1 == getSelectionCount() ) { - getBorderWin()->getView()->getElementNotification()->onEntrySelect(_pEntry); + getBorderWin().getView()->getElementNotification()->onEntrySelect(_pEntry); } else { @@ -897,25 +901,25 @@ // ----------------------------------------------------------------------------- IMPL_LINK( OAppDetailPageHelper, OnCutEntry, SvLBoxEntry*, _pEntry ) { - getBorderWin()->getView()->getElementNotification()->onCutEntry(_pEntry); + getBorderWin().getView()->getElementNotification()->onCutEntry(_pEntry); return 1L; } // ----------------------------------------------------------------------------- IMPL_LINK( OAppDetailPageHelper, OnCopyEntry, SvLBoxEntry*, _pEntry ) { - getBorderWin()->getView()->getElementNotification()->onCopyEntry(_pEntry); + getBorderWin().getView()->getElementNotification()->onCopyEntry(_pEntry); return 1L; } // ----------------------------------------------------------------------------- IMPL_LINK( OAppDetailPageHelper, OnPasteEntry, SvLBoxEntry*, _pEntry ) { - getBorderWin()->getView()->getElementNotification()->onPasteEntry(_pEntry); + getBorderWin().getView()->getElementNotification()->onPasteEntry(_pEntry); return 1L; } // ----------------------------------------------------------------------------- IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, SvLBoxEntry*, _pEntry ) { - getBorderWin()->getView()->getElementNotification()->onDeleteEntry(_pEntry); + getBorderWin().getView()->getElementNotification()->onDeleteEntry(_pEntry); return 1L; } // ----------------------------------------------------------------------------- @@ -982,14 +986,14 @@ nSelectedAction = SID_DB_APP_VIEW_DOC_PREVIEW; break; case E_DOCUMENTINFO: - if ( getBorderWin()->getView()->getCommandController()->isCommandEnabled(SID_DB_APP_VIEW_DOCINFO_PREVIEW) ) + if ( getBorderWin().getView()->getCommandController()->isCommandEnabled(SID_DB_APP_VIEW_DOCINFO_PREVIEW) ) nSelectedAction = SID_DB_APP_VIEW_DOCINFO_PREVIEW; else m_ePreviewMode = E_PREVIEWNONE; break; } - getBorderWin()->getView()->getViewChangeListener()->previewChanged(static_cast<sal_Int32>(m_ePreviewMode)); + getBorderWin().getView()->getViewChangeListener()->previewChanged(static_cast<sal_Int32>(m_ePreviewMode)); m_aMenu->CheckItem(nSelectedAction); m_aTBPreview.SetItemText(SID_DB_APP_DISABLE_PREVIEW, m_aMenu->GetItemText(nSelectedAction)); @@ -1003,7 +1007,7 @@ SvLBoxEntry* pEntry = pTree->GetSelectedEntry(); if ( pEntry ) { - getBorderWin()->getView()->getElementNotification()->onEntrySelect(pEntry); + getBorderWin().getView()->getElementNotification()->onEntrySelect(pEntry); } } } @@ -1080,7 +1084,6 @@ } // ----------------------------------------------------------------------------- void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable) { @@ -1094,10 +1097,10 @@ { try { - m_xFrame = Reference < XFrame > ( getBorderWin()->getView()->getORB()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ); + m_xFrame = Reference < XFrame > ( getBorderWin().getView()->getORB()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ); m_xFrame->initialize( m_xWindow ); - Reference<XFramesSupplier> xSup(getBorderWin()->getView()->getController()->getFrame(),UNO_QUERY); + Reference<XFramesSupplier> xSup(getBorderWin().getView()->getController()->getFrame(),UNO_QUERY); if ( xSup.is() ) { Reference<XFrames> xFrames = xSup->getFrames(); @@ -1108,8 +1111,10 @@ { } } + + Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getController(), UNO_QUERY ); ::std::auto_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser( - getBorderWin()->getView()->getORB(), _xConnection, _bTable + getBorderWin().getView()->getORB(), xApplication, _bTable ) ); pDispatcher->setTargetFrame( m_xFrame ); @@ -1156,7 +1161,7 @@ m_aTBPreview.Update(); // execute the menu - IController* pControler = getBorderWin()->getView()->getCommandController(); + IController* pControler = getBorderWin().getView()->getCommandController(); ::std::auto_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) )); sal_uInt16 pActions[] = { SID_DB_APP_DISABLE_PREVIEW @@ -1182,7 +1187,7 @@ { m_aTBPreview.SetItemText(SID_DB_APP_DISABLE_PREVIEW, aMenu->GetItemText(nSelectedAction)); Resize(); - getBorderWin()->getView()->getCommandController()->executeChecked(nSelectedAction,Sequence<PropertyValue>()); + getBorderWin().getView()->getCommandController()->executeChecked(nSelectedAction,Sequence<PropertyValue>()); } return 0L; } @@ -1199,7 +1204,7 @@ if ( KEY_RETURN == nCode ) { - getBorderWin()->getView()->getElementNotification()->onEntryDoubleClick(getCurrentView()); + getBorderWin().getView()->getElementNotification()->onEntryDoubleClick(getCurrentView()); } else Window::KeyInput(rKEvt); File [changed]: AppDetailPageHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.hxx?r1=1.10.12.2&r2=1.10.12.3 Delta lines: +5 -8 ------------------- --- AppDetailPageHelper.hxx 18 Sep 2006 09:00:20 -0000 1.10.12.2 +++ AppDetailPageHelper.hxx 18 Sep 2006 13:54:13 -0000 1.10.12.3 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.hxx,v $ * - * $Revision: 1.10.12.2 $ + * $Revision: 1.10.12.3 $ * - * last change: $Author: fs $ $Date: 2006/09/18 09:00:20 $ + * last change: $Author: fs $ $Date: 2006/09/18 13:54:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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; @@ -211,10 +211,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 @@ -377,8 +377,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 @@ -386,7 +384,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); File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.17.32.1&r2=1.17.32.2 Delta lines: +9 -10 -------------------- --- AppDetailView.cxx 14 Sep 2006 11:54:41 -0000 1.17.32.1 +++ AppDetailView.cxx 18 Sep 2006 13:54:13 -0000 1.17.32.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.cxx,v $ * - * $Revision: 1.17.32.1 $ + * $Revision: 1.17.32.2 $ * - * last change: $Author: fs $ $Date: 2006/09/14 11:54:41 $ + * last change: $Author: fs $ $Date: 2006/09/18 13:54:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -475,7 +475,7 @@ try { - Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin()->getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); + Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); @@ -535,23 +535,23 @@ // class OApplicationDetailView //================================================================== DBG_NAME(OApplicationDetailView) -OApplicationDetailView::OApplicationDetailView(OAppBorderWindow* _pParent,PreviewMode _ePreviewMode) : OSplitterView(_pParent,sal_False ) +OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent,sal_False ) ,m_aHorzSplitter(this) ,m_aTasks(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL ) ,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL ) - ,m_pBorderWin(_pParent) + ,m_rBorderWin(_rParent) { DBG_CTOR(OApplicationDetailView,NULL); SetUniqueId(UID_APP_DETAIL_VIEW); ImplInitSettings( sal_True, sal_True, sal_True ); - m_pControlHelper = new OAppDetailPageHelper(&m_aContainer,_pParent,_ePreviewMode); + m_pControlHelper = new OAppDetailPageHelper(&m_aContainer,m_rBorderWin,_ePreviewMode); m_pControlHelper->Show(); m_aContainer.setChildWindow(m_pControlHelper); OTasksWindow* pTasks = new OTasksWindow(&m_aTasks,this); pTasks->Show(); - pTasks->Disable(_pParent->getView()->getCommandController()->isDataSourceReadOnly()); + pTasks->Disable(m_rBorderWin.getView()->getCommandController()->isDataSourceReadOnly()); m_aTasks.setChildWindow(pTasks); m_aTasks.SetUniqueId(UID_APP_TASKS_VIEW); m_aTasks.Show(); @@ -636,7 +636,7 @@ ::com::sun::star::util::URL aUrl; aUrl.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")); - if ( getBorderWin()->getView()->getCommandController()->isCommandEnabled(aUrl) ) + if ( getBorderWin().getView()->getCommandController()->isCommandEnabled(aUrl) ) aList.push_back( TResourceStruct::value_type(ModuleRes(RID_STR_NEW_VIEW),TResourcePair(aUrl.Complete,RID_STR_VIEWS_HELP_TEXT_DESIGN))); // aList.push_back( TResourceStruct::value_type(ModuleRes(RID_STR_NEW_VIEW_AUTO),TResourcePair(ID_NEW_VIEW_DESIGN_AUTO_PILOT,RID_STR_VIEWS_HELP_TEXT_WIZARD))); @@ -849,12 +849,11 @@ } // ----------------------------------------------------------------------------- void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable) { DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->showPreview(_sDataSourceName,_xConnection,_sName,_bTable); + m_pControlHelper->showPreview(_sDataSourceName,_sName,_bTable); } // ----------------------------------------------------------------------------- sal_Bool OApplicationDetailView::isSortUp() const File [changed]: AppDetailView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.hxx?r1=1.11.120.1&r2=1.11.120.2 Delta lines: +5 -8 ------------------- --- AppDetailView.hxx 14 Sep 2006 11:54:41 -0000 1.11.120.1 +++ AppDetailView.hxx 18 Sep 2006 13:54:13 -0000 1.11.120.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.hxx,v $ * - * $Revision: 1.11.120.1 $ + * $Revision: 1.11.120.2 $ * - * last change: $Author: fs $ $Date: 2006/09/14 11:54:41 $ + * last change: $Author: fs $ $Date: 2006/09/18 13:54:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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(); @@ -322,8 +322,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 @@ -331,7 +329,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]
