Kaydet (Commit) 0e263d61 authored tarafından Caolán McNamara's avatar Caolán McNamara

order pImpl before aGraphic because aGraphic deferences pImpl in ctor

üst 6270e76b
...@@ -233,6 +233,8 @@ class SmViewShell: public SfxViewShell ...@@ -233,6 +233,8 @@ class SmViewShell: public SfxViewShell
// for handling the PasteClipboardState // for handling the PasteClipboardState
friend class SmClipboardChangeListener; friend class SmClipboardChangeListener;
SmViewShell_Impl* pImpl;
SmGraphicWindow aGraphic; SmGraphicWindow aGraphic;
SmGraphicController aGraphicController; SmGraphicController aGraphicController;
String StatusText; String StatusText;
...@@ -240,7 +242,6 @@ class SmViewShell: public SfxViewShell ...@@ -240,7 +242,6 @@ class SmViewShell: public SfxViewShell
::com::sun::star::uno:: Reference < ::com::sun::star::uno:: Reference <
::com::sun::star::lang:: XEventListener > xClipEvtLstnr; ::com::sun::star::lang:: XEventListener > xClipEvtLstnr;
SmClipboardChangeListener* pClipEvtLstnr; SmClipboardChangeListener* pClipEvtLstnr;
SmViewShell_Impl* pImpl;
bool bPasteState; bool bPasteState;
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
......
...@@ -2006,9 +2006,9 @@ void SmViewShell::GetState(SfxItemSet &rSet) ...@@ -2006,9 +2006,9 @@ void SmViewShell::GetState(SfxItemSet &rSet)
SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *): SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *):
SfxViewShell(pFrame_, SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT), SfxViewShell(pFrame_, SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT),
pImpl( new SmViewShell_Impl ),
aGraphic(this), aGraphic(this),
aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings()), aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings())
pImpl( new SmViewShell_Impl )
{ {
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SmViewShell" ); RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SmViewShell" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment