diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 11:01:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 11:01:39 +0000 |
| commit | e00b02d1d7348ac6a33cf602575bebbce3faf588 (patch) | |
| tree | 6d958b374b85d4abbd0bce41f200edc0f9e2433c /extensions/source/propctrlr/browserview.cxx | |
| parent | b822ebb0444764eeffb5ce88affd0407a8e1e3fd (diff) | |
INTEGRATION: CWS eforms2 (1.8.156); FILE MERGED
2004/04/26 11:29:39 fs 1.8.156.1: some cleanup/consolidation
Diffstat (limited to 'extensions/source/propctrlr/browserview.cxx')
| -rw-r--r-- | extensions/source/propctrlr/browserview.cxx | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index b1048eec59c2..ae577eba3e98 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: browserview.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-03-25 16:03:48 $ + * last change: $Author: obo $ $Date: 2004-11-16 12:01:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,9 +71,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif -#ifndef _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_ -#include "propcontroller.hxx" -#endif +//#ifndef _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_ +//#include "propcontroller.hxx" +//#endif #include <memory> //............................................................................ @@ -93,7 +93,6 @@ namespace pcr OPropertyBrowserView::OPropertyBrowserView( const Reference< XMultiServiceFactory >& _rxORB, Window* _pParent, WinBits nBits) :Window(_pParent, nBits | WB_3DLOOK) - ,m_pActiveController(NULL) ,m_xORB(_rxORB) ,m_nActivePage(0) { @@ -110,7 +109,6 @@ namespace pcr OPropertyBrowserView::OPropertyBrowserView( const Reference< XMultiServiceFactory >& _rxORB, Window* _pParent, const ResId& rId) :Window(_pParent, rId) - ,m_pActiveController(NULL) ,m_xORB(_rxORB) ,m_nActivePage(0) { @@ -145,10 +143,6 @@ namespace pcr ::std::auto_ptr<Window> aTemp(m_pPropBox); m_pPropBox = NULL; } - if (m_pActiveController) - m_pActiveController->release(); - m_pActiveController = NULL; - m_xORB = NULL; DBG_DTOR(OPropertyBrowserView, NULL); @@ -162,17 +156,6 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserView::setActiveController(OPropertyBrowserController* _pController) - { - if (_pController != m_pActiveController) - { - if (m_pActiveController) m_pActiveController->release(); - m_pActiveController = _pController; - if (m_pActiveController) m_pActiveController->acquire(); - } - } - - //------------------------------------------------------------------------ void OPropertyBrowserView::GetFocus() { if (m_pPropBox) |