Kaydet (Commit) 42837a06 authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Resolves: #i123840# prefer NSZero* constants over open coded alternatives

(cherry picked from commit a8c471a7)

Conflicts:
	vcl/osx/salframe.cxx
	vcl/osx/salframeview.mm
	vcl/osx/salnsmenu.mm
	vcl/osx/salobj.cxx

Change-Id: I379d80355d741dd28aad2e6119a8b82ac10159f5
üst 93f3f72d
...@@ -640,7 +640,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize, ...@@ -640,7 +640,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize,
NSArray* pSubViews = [pNSView subviews]; NSArray* pSubViews = [pNSView subviews];
unsigned int nViews = [pSubViews count]; unsigned int nViews = [pSubViews count];
NSRect aUnion = { { 0, 0 }, { 0, 0 } }; NSRect aUnion = NSZeroRect;
// get the combined frame of all subviews // get the combined frame of all subviews
for( unsigned int n = 0; n < nViews; n++ ) for( unsigned int n = 0; n < nViews; n++ )
...@@ -709,7 +709,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize aTabSize ) ...@@ -709,7 +709,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize aTabSize )
static NSControl* createLabel( const rtl::OUString& i_rText ) static NSControl* createLabel( const rtl::OUString& i_rText )
{ {
NSString* pText = CreateNSString( i_rText ); NSString* pText = CreateNSString( i_rText );
NSRect aTextRect = { { 0, 0 }, {20, 15} }; NSRect aTextRect = { NSZeroPoint, {20, 15} };
NSTextField* pTextView = [[NSTextField alloc] initWithFrame: aTextRect]; NSTextField* pTextView = [[NSTextField alloc] initWithFrame: aTextRect];
[pTextView setFont: [NSFont controlContentFontOfSize: 0]]; [pTextView setFont: [NSFont controlContentFontOfSize: 0]];
[pTextView setEditable: NO]; [pTextView setEditable: NO];
...@@ -1100,9 +1100,9 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO ...@@ -1100,9 +1100,9 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
NSView* pCurParent = 0; NSView* pCurParent = 0;
long nCurY = 0; long nCurY = 0;
long nCurX = 0; long nCurX = 0;
NSRect aViewFrame = { { 0, 0 }, {600, 400 } }; NSRect aViewFrame = { NSZeroPoint, {600, 400 } };
NSRect aTabViewFrame = { { 190, 0 }, {410, 400 } }; NSRect aTabViewFrame = { { 190, 0 }, {410, 400 } };
NSSize aMaxTabSize = { 0, 0 }; NSSize aMaxTabSize = NSZeroSize;
NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame]; NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame];
NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame]; NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame];
[pAccessoryView addSubview: [pTabView autorelease]]; [pAccessoryView addSubview: [pTabView autorelease]];
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
@implementation AquaPrintView @implementation AquaPrintView
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
{ {
NSRect aRect = { { 0, 0 }, [pInfoPrinter->getPrintInfo() paperSize] }; NSRect aRect = { NSZeroPoint, [pInfoPrinter->getPrintInfo() paperSize] };
if( (self = [super initWithFrame: aRect]) != nil ) if( (self = [super initWithFrame: aRect]) != nil )
{ {
mpController = pController; mpController = pController;
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
-(NSPoint)locationOfPrintRect: (NSRect)aRect -(NSPoint)locationOfPrintRect: (NSRect)aRect
{ {
(void)aRect; (void)aRect;
NSPoint aPoint = { 0, 0 }; return NSZeroPoint;
return aPoint;
} }
-(void)drawRect: (NSRect)rect -(void)drawRect: (NSRect)rect
......
...@@ -207,7 +207,7 @@ void AquaSalFrame::initWindowAndView() ...@@ -207,7 +207,7 @@ void AquaSalFrame::initWindowAndView()
{ {
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO); 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]; mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO];
maSysData.mpNSView = mpNSView; maSysData.mpNSView = mpNSView;
...@@ -743,7 +743,7 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) ...@@ -743,7 +743,7 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
// which is always on index 0 according to documentation // which is always on index 0 according to documentation
bool bHideMenu = (nDisplay == 0); bool bHideMenu = (nDisplay == 0);
NSRect aNewContentRect = { { 0, 0 }, { 0, 0 } }; NSRect aNewContentRect = NSZeroRect;
// get correct screen // get correct screen
NSScreen* pScreen = nil; NSScreen* pScreen = nil;
NSArray* pScreens = [NSScreen screens]; NSArray* pScreens = [NSScreen screens];
...@@ -1621,7 +1621,7 @@ void AquaSalFrame::UpdateFrameGeometry() ...@@ -1621,7 +1621,7 @@ void AquaSalFrame::UpdateFrameGeometry()
// release old track rect // release old track rect
[mpNSView removeTrackingRect: mnTrackingRectTag]; [mpNSView removeTrackingRect: mnTrackingRectTag];
// install the new track rect // 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]; mnTrackingRectTag = [mpNSView addTrackingRect: aTrackRect owner: mpNSView userData: nil assumeInside: NO];
// convert to vcl convention // convert to vcl convention
......
...@@ -490,7 +490,7 @@ static AquaSalFrame* getMouseContainerFrame() ...@@ -490,7 +490,7 @@ static AquaSalFrame* getMouseContainerFrame()
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
{ {
// FIXME: does this leak the returned NSCursor of getCurrentCursor ? // FIXME: does this leak the returned NSCursor of getCurrentCursor ?
NSRect aRect = { { 0, 0 }, { static_cast<CGFloat>(mpFrame->maGeometry.nWidth), static_cast<CGFloat>(mpFrame->maGeometry.nHeight) } }; const NSRect aRect = { NSZeroPoint, NSMakeSize( mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight) };
[self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()]; [self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()];
} }
} }
......
...@@ -194,9 +194,8 @@ sal_Bool ImplSVMainHook( int * pnInit ) ...@@ -194,9 +194,8 @@ sal_Bool ImplSVMainHook( int * pnInit )
bNoSVMain = false; bNoSVMain = false;
initNSApp(); initNSApp();
NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
location: aPt location: NSZeroPoint
modifierFlags: 0 modifierFlags: 0
timestamp: 0 timestamp: 0
windowNumber: 0 windowNumber: 0
...@@ -422,9 +421,8 @@ void AquaSalInstance::wakeupYield() ...@@ -422,9 +421,8 @@ void AquaSalInstance::wakeupYield()
if( mbWaitingYield ) if( mbWaitingYield )
{ {
SalData::ensureThreadAutoreleasePool(); SalData::ensureThreadAutoreleasePool();
NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
location: aPt location: NSZeroPoint
modifierFlags: 0 modifierFlags: 0
timestamp: 0 timestamp: 0
windowNumber: 0 windowNumber: 0
......
...@@ -131,9 +131,8 @@ ...@@ -131,9 +131,8 @@
NSRect aImgRect = { { 2, 0 }, { 0, 0 } }; NSRect aImgRect = { { 2, 0 }, { 0, 0 } };
for( size_t i = 0; i < rButtons.size(); ++i ) for( size_t i = 0; i < rButtons.size(); ++i )
{ {
NSRect aFromRect = { { 0, 0 }, const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
{ static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()), const NSRect aFromRect = { NSZeroPoint, NSMakeSize( aPixSize.Width(), aPixSize.Height()) };
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
aImgRect.origin.y = floor((aFrame.size.height - aFromRect.size.height)/2); aImgRect.origin.y = floor((aFrame.size.height - aFromRect.size.height)/2);
aImgRect.size = aFromRect.size; aImgRect.size = aFromRect.size;
if( rButtons[i].mpNSImage ) if( rButtons[i].mpNSImage )
...@@ -155,9 +154,8 @@ ...@@ -155,9 +154,8 @@
NSPoint aMousePt = [pEvent locationInWindow]; NSPoint aMousePt = [pEvent locationInWindow];
for( size_t i = 0; i < rButtons.size(); ++i ) for( size_t i = 0; i < rButtons.size(); ++i )
{ {
NSRect aFromRect = { { 0, 0 }, const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
{ static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()), const NSRect aFromRect = { NSZeroPoint, NSMakeSize( aPixSize.Width(), aPixSize.Height()) };
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2; aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2;
aImgRect.size = aFromRect.size; aImgRect.size = aFromRect.size;
if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <= (aImgRect.origin.x+aImgRect.size.width) && if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <= (aImgRect.origin.x+aImgRect.size.width) &&
......
...@@ -41,7 +41,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : ...@@ -41,7 +41,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
maSysData.nSize = sizeof( maSysData ); maSysData.nSize = sizeof( maSysData );
maSysData.mpNSView = NULL; maSysData.mpNSView = NULL;
NSRect aInitFrame = { { 0, 0 }, { 20, 20 } }; NSRect aInitFrame = { NSZeroPoint, { 20, 20 } };
mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ]; mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
if( mpClipView ) if( mpClipView )
{ {
...@@ -168,15 +168,15 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) ...@@ -168,15 +168,15 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
void AquaSalObject::setClippedPosSize() void AquaSalObject::setClippedPosSize()
{ {
NSRect aViewRect = { { 0, 0 }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } }; NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) };
if( maSysData.mpNSView ) if( maSysData.mpNSView )
{ {
NSView* pNSView = maSysData.mpNSView; NSView* pNSView = maSysData.mpNSView;
[pNSView setFrame: aViewRect]; [pNSView setFrame: aViewRect];
} }
NSRect aClipViewRect = { { static_cast<CGFloat>(mnX), static_cast<CGFloat>(mnY) }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } }; NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);
NSPoint aClipPt = { 0, 0 }; NSPoint aClipPt = NSZeroPoint;
if( mbClip ) if( mbClip )
{ {
aClipViewRect.origin.x += mnClipX; aClipViewRect.origin.x += mnClipX;
......
...@@ -65,9 +65,8 @@ void ImplSalStartTimer( sal_uLong nMS ) ...@@ -65,9 +65,8 @@ void ImplSalStartTimer( sal_uLong nMS )
{ {
SalData::ensureThreadAutoreleasePool(); SalData::ensureThreadAutoreleasePool();
// post an event so we can get into the main thread // post an event so we can get into the main thread
NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
location: aPt location: NSZeroPoint
modifierFlags: 0 modifierFlags: 0
timestamp: [NSDate timeIntervalSinceReferenceDate] timestamp: [NSDate timeIntervalSinceReferenceDate]
windowNumber: 0 windowNumber: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment