summaryrefslogtreecommitdiffstats
path: root/svx/source/form
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-01-28 11:44:02 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-01-28 11:44:02 +0100
commit4ba03a461e6dae4d182fc7f6b94e781922881caa (patch)
treef88767becc927b2d8fa7b05f9ec4218660b82496 /svx/source/form
parentundoapi: re-enabled the complex test cases in sfx2, using the old build syste... (diff)
parentmasterfix: #i10000# resource fix (diff)
downloadcore-4ba03a461e6dae4d182fc7f6b94e781922881caa.tar.gz
core-4ba03a461e6dae4d182fc7f6b94e781922881caa.zip
undoapi: pulled and merged DEV300.m98
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/fmscriptingenv.cxx1
-rw-r--r--svx/source/form/fmundo.cxx3
2 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index f351dba85815..3e8aa88a2612 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -430,6 +430,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 e63325f710e9..ed0d57b96f97 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() )
{