diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-06-06 10:03:25 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-06-06 14:37:06 +0200 |
commit | a1a4787a4014f70b00f73fab56996e285e5ed1d0 (patch) | |
tree | c9490b0da77dcccc6cb0525cfaf22042faf62bfe /vcl/osx | |
parent | a2f4bdb191d8d11824a0292880377dd4a20ac145 (diff) |
loplugin:data (macOS)
Change-Id: I404a8364a4c7f8d48533fb3c7757a5b7798de9d8
Reviewed-on: https://gerrit.libreoffice.org/73588
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/osx')
-rw-r--r-- | vcl/osx/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/osx/salframeview.mm | 2 | ||||
-rw-r--r-- | vcl/osx/salmenu.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 2a60c8d85f81..f72ec1f53f57 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1767,7 +1767,7 @@ void AquaSalFrame::EndSetClipRegion() if( ! maClippingRects.empty() ) { mrClippingPath = CGPathCreateMutable(); - CGPathAddRects( mrClippingPath, nullptr, &maClippingRects[0], maClippingRects.size() ); + CGPathAddRects( mrClippingPath, nullptr, maClippingRects.data(), maClippingRects.size() ); } if( mpNSView && mbShown ) [mpNSView setNeedsDisplay: YES]; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index baf5fa96773e..3b2eb52f5eb5 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1622,7 +1622,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aInputEvent.maText = aInsertString; aInputEvent.mnCursorPos = selRange.location; - aInputEvent.mpTextAttr = &aInputFlags[0]; + aInputEvent.mpTextAttr = aInputFlags.data(); mpFrame->CallCallback( SalEvent::ExtTextInput, static_cast<void *>(&aInputEvent) ); } else { aInputEvent.maText.clear(); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index e55d253a18fc..e52b145634ad 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -804,7 +804,7 @@ void AquaSalMenu::RemoveMenuBarButton( sal_uInt16 i_nId ) { releaseButtonEntry( *pEntry ); // note: vector guarantees that its contents are in a plain array - maButtons.erase( maButtons.begin() + (pEntry - &maButtons[0]) ); + maButtons.erase( maButtons.begin() + (pEntry - maButtons.data()) ); } if( pCurrentMenuBar == this ) |