summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-01-08 22:50:33 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-01-08 22:50:33 +0100
commit93857a0ec92ee511c0ddce90004cd40e338a93f5 (patch)
tree715aa886d24de2ddd636766ab292043a25dda231 /sw/source/ui/frmdlg
parent3a66e8444c9086c53a27159a1a0edad3b6e85ff5 (diff)
parent9d43ce3490eb06668cd7fa6e7d29b7a7ced18957 (diff)
autorecovery: merge after rebase to m69
Diffstat (limited to 'sw/source/ui/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index c4b463baa297..914788a36e7a 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -196,7 +196,7 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
aNewSet.Put( SwMacroAssignDlg::AddEvents(
DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) );
if ( m_pWrtShell )
- rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame()->GetFrameInterface() );
+ rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
rPage.PageCreated(aNewSet);
break;
}