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/vclnsapp.mm | |
| 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/vclnsapp.mm')
| -rw-r--r-- | vcl/osx/vclnsapp.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index dafcdb97aca5..247e603644e4 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -317,7 +317,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { SolarMutexGuard aGuard; - AquaSalInstance *pInst = GetSalData()->mpFirstInstance; + AquaSalInstance *pInst = GetSalData()->mpInstance; SalFrame *pAnyFrame = pInst->anyFrame(); if( pAnyFrame ) { @@ -344,7 +344,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP (void)pNotification; SolarMutexGuard aGuard; - AquaSalInstance *pInst = GetSalData()->mpFirstInstance; + AquaSalInstance *pInst = GetSalData()->mpInstance; SalFrame *pAnyFrame = pInst->anyFrame(); if( pAnyFrame ) pAnyFrame->CallCallback( SalEvent::SettingsChanged, nullptr ); @@ -355,7 +355,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP (void)pNotification; SolarMutexGuard aGuard; - for( auto pSalFrame : GetSalData()->mpFirstInstance->getFrames() ) + for( auto pSalFrame : GetSalData()->mpInstance->getFrames() ) { AquaSalFrame *pFrame = static_cast<AquaSalFrame*>( const_cast<SalFrame*>( pSalFrame ) ); pFrame->screenParametersChanged(); @@ -365,13 +365,13 @@ SAL_WNODEPRECATED_DECLARATIONS_POP -(void)scrollbarVariantChanged: (NSNotification*) pNotification { (void)pNotification; - GetSalData()->mpFirstInstance->delayedSettingsChanged( true ); + GetSalData()->mpInstance->delayedSettingsChanged( true ); } -(void)scrollbarSettingsChanged: (NSNotification*) pNotification { (void)pNotification; - GetSalData()->mpFirstInstance->delayedSettingsChanged( false ); + GetSalData()->mpInstance->delayedSettingsChanged( false ); } -(void)addFallbackMenuItem: (NSMenuItem*)pNewItem |