diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-29 09:18:51 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-29 21:14:10 +0200 |
commit | 442771d105fbce531ec3df5673dcc4a5f7a8bc7b (patch) | |
tree | 477b103a5aeb22fa87d9d1af45640c73236033f0 /vcl/osx/salframe.cxx | |
parent | 41af2a9e26f3ee6b505b343120d5df3617ba5c49 (diff) |
OSX rename mpFirstInstance to mpInstance
In the same spirit as the Windows commit
7c52d86f7b05fe7e0178f6d98a12a531b88a32ff.
Change-Id: Ic45803c0715723b6f57c9f6a0c731edd559aa92c
Reviewed-on: https://gerrit.libreoffice.org/42932
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/osx/salframe.cxx')
-rw-r--r-- | vcl/osx/salframe.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index dcdfe6d9c936..ff87c83e3205 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -87,12 +87,12 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle initWindowAndView(); SalData* pSalData = GetSalData(); - pSalData->mpFirstInstance->insertFrame( this ); + pSalData->mpInstance->insertFrame( this ); } AquaSalFrame::~AquaSalFrame() { - assert( GetSalData()->mpFirstInstance->IsMainThread() ); + assert( GetSalData()->mpInstance->IsMainThread() ); // if the frame is destroyed and has the current menubar // set the default menubar @@ -105,7 +105,7 @@ AquaSalFrame::~AquaSalFrame() [SalFrameView unsetMouseFrame: this]; SalData* pSalData = GetSalData(); - pSalData->mpFirstInstance->eraseFrame( this ); + pSalData->mpInstance->eraseFrame( this ); pSalData->maPresentationFrames.remove( this ); SAL_WARN_IF( this == s_pCaptureFrame, "vcl", "capture frame destroyed" ); @@ -294,7 +294,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) bool AquaSalFrame::PostEvent(ImplSVEvent* pData) { - GetSalData()->mpFirstInstance->PostEvent( this, pData, SalEvent::UserEvent ); + GetSalData()->mpInstance->PostEvent( this, pData, SalEvent::UserEvent ); return TRUE; } |