strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress153_DEV300 (1.39.96); FILE MERGED

Browse source 
2008/08/20 18:57:42 fs 1.39.96.1: #i92864# +impl_checkDisposed
This commit is contained in:
Rüdiger Timm 2008-08-28 05:55:30 +00:00
parent a217499f1e
commit e1a3088d11
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
svx/source/inc/fmshimp.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: fmshimp.hxx,v $ * $RCSfile: fmshimp.hxx,v $
* $Revision: 1.40 $ * $Revision: 1.41 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -303,7 +303,7 @@ public:
didPrepareClose( sal_Bool _bDid ) { m_bPreparedClose = _bDid; } didPrepareClose( sal_Bool _bDid ) { m_bPreparedClose = _bDid; }
public: public:
FmXFormShell(FmFormShell* _pShell, SfxViewFrame* _pViewFrame); FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
// UNO Anbindung // UNO Anbindung
DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE); DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE);
@ -342,8 +342,8 @@ public:
sal_Bool IsTrackPropertiesEnabled() {return m_bTrackProperties;} sal_Bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
// activation handling // activation handling
void viewActivated( FmFormView* _pCurrentView, sal_Bool _bSyncAction = sal_False ); void viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction = sal_False );
void viewDeactivated( FmFormView* _pCurrentView, sal_Bool _bDeactivateController = sal_True ); void viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController = sal_True );
// IControllerFeatureInvalidation // IControllerFeatureInvalidation
virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ); virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures );
@ -391,6 +391,11 @@ protected:
FmFormArray& _out_rForms, FmFormArray& _out_rForms,
::std::vector< String >& _out_rNames ); ::std::vector< String >& _out_rNames );
/** checks whether the instance is already disposed, if so, this is reported as assertion error (debug
builds only) and <TRUE/> is returned.
*/
bool impl_checkDisposed() const;
public: public:
// methode fuer nicht designmode (alive mode) // methode fuer nicht designmode (alive mode)
void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False ); void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False );