[Libreoffice-commits] .: starmath/inc starmath/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 21 14:02:23 PDT 2011
starmath/inc/view.hxx | 3 ++-
starmath/source/view.cxx | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit d7b9ba695daa075965f5d43a965cfabb46d8ad98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 21 21:01:52 2011 +0000
order pImpl before aGraphic because aGraphic deferences pImpl in ctor
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index f91ab3e..10ebbb2 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -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* );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 14ed4d3..3a099c3 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -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" );
More information about the Libreoffice-commits
mailing list