diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
| commit | 605209eda74b0b31a8da020a2dfd2bbadbb1c7d4 (patch) | |
| tree | df8a931de7a4c4b1ee5ab1f7ed5506388943ecbc /svx/source/form | |
| parent | removetooltypes01: #i112600# Merge changes (diff) | |
| parent | masterfix: #i10000# resource fix (diff) | |
| download | core-605209eda74b0b31a8da020a2dfd2bbadbb1c7d4.tar.gz core-605209eda74b0b31a8da020a2dfd2bbadbb1c7d4.zip | |
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 1 | ||||
| -rw-r--r-- | svx/source/form/fmundo.cxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 154999333296..b8b4055ef5de 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -481,6 +481,7 @@ namespace svxform if ( m_bDisposed ) return; + // SfxObjectShellRef is good here since the model controls the lifetime of the object SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell(); if( !xObjectShell.Is() ) return; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 35dc652b9330..eee61c5c2dee 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -130,6 +130,8 @@ private: { Reference< XMultiComponentFactory > xMFac( xCtx->getServiceManager(), UNO_QUERY ); + + // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef xObjSh = pModel->GetObjectShell(); Reference< XMultiServiceFactory > xDocFac; if ( xObjSh.Is() ) @@ -150,6 +152,7 @@ private: { try { + // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef xObjSh = pModel->GetObjectShell(); if ( xObjSh.Is() && m_vbaListener.is() ) { |