order pImpl before aGraphic because aGraphic deferences pImpl in ctor

This commit is contained in:
Caolán McNamara 2011-03-21 21:01:52 +00:00
parent 6270e76bf5
commit 0e263d6181
2 changed files with 4 additions and 3 deletions

View file

@ -233,6 +233,8 @@ class SmViewShell: public SfxViewShell
// for handling the PasteClipboardState
friend class SmClipboardChangeListener;
SmViewShell_Impl* pImpl;
SmGraphicWindow aGraphic;
SmGraphicController aGraphicController;
String StatusText;
@ -240,7 +242,6 @@ class SmViewShell: public SfxViewShell
::com::sun::star::uno:: Reference <
::com::sun::star::lang:: XEventListener > xClipEvtLstnr;
SmClipboardChangeListener* pClipEvtLstnr;
SmViewShell_Impl* pImpl;
bool bPasteState;
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );

View file

@ -2006,9 +2006,9 @@ void SmViewShell::GetState(SfxItemSet &rSet)
SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *):
SfxViewShell(pFrame_, SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT),
pImpl( new SmViewShell_Impl ),
aGraphic(this),
aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings()),
pImpl( new SmViewShell_Impl )
aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings())
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SmViewShell" );