diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-02-24 09:08:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-24 13:17:37 +0000 |
| commit | 42837a066b2347effa75926104f3f3ffc96206b7 (patch) | |
| tree | 4fac4398665aafa9b2b66c685dfa0c5df6cd1fb7 /vcl/osx/salframe.cxx | |
| parent | 93f3f72d18e551c8edd6a010cb78d9cbe404f8ef (diff) | |
Resolves: #i123840# prefer NSZero* constants over open coded alternatives
(cherry picked from commit a8c471a7003fdac7d5e1c97e903f669da6bcf0c7)
Conflicts:
vcl/osx/salframe.cxx
vcl/osx/salframeview.mm
vcl/osx/salnsmenu.mm
vcl/osx/salobj.cxx
Change-Id: I379d80355d741dd28aad2e6119a8b82ac10159f5
Diffstat (limited to 'vcl/osx/salframe.cxx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 71a951c42d68..e49df676fbf0 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -207,7 +207,7 @@ void AquaSalFrame::initWindowAndView() { objc_msgSend(mpNSWindow, @selector(setRestorable:), NO); } - NSRect aRect = { { 0,0 }, { static_cast<CGFloat>(maGeometry.nWidth), static_cast<CGFloat>(maGeometry.nHeight) } }; + const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, maGeometry.nHeight )}; mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO]; maSysData.mpNSView = mpNSView; @@ -743,7 +743,7 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) // which is always on index 0 according to documentation bool bHideMenu = (nDisplay == 0); - NSRect aNewContentRect = { { 0, 0 }, { 0, 0 } }; + NSRect aNewContentRect = NSZeroRect; // get correct screen NSScreen* pScreen = nil; NSArray* pScreens = [NSScreen screens]; @@ -1621,7 +1621,7 @@ void AquaSalFrame::UpdateFrameGeometry() // release old track rect [mpNSView removeTrackingRect: mnTrackingRectTag]; // install the new track rect - NSRect aTrackRect = { { 0, 0 }, aContentRect.size }; + NSRect aTrackRect = { NSZeroPoint, aContentRect.size }; mnTrackingRectTag = [mpNSView addTrackingRect: aTrackRect owner: mpNSView userData: nil assumeInside: NO]; // convert to vcl convention |