Author: hdu
Date: Mon Feb 24 09:08:02 2014
New Revision: 1571189
URL: http://svn.apache.org/r1571189
Log:
#i123840# prefer NSZero* constants over open coded altetnatives
Modified:
openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
openoffice/trunk/main/vcl/aqua/source/app/saltimer.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm
openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx
openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm
openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx Mon Feb 24 09:08:02
2014
@@ -213,9 +213,8 @@ sal_Bool ImplSVMainHook( sal_Bool * pbIn
bNoSVMain = false;
initNSApp();
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: 0
windowNumber: 0
@@ -495,9 +494,8 @@ void AquaSalInstance::wakeupYield()
if( mbWaitingYield )
{
SalData::ensureThreadAutoreleasePool();
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: 0
windowNumber: 0
Modified: openoffice/trunk/main/vcl/aqua/source/app/saltimer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/saltimer.cxx?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/saltimer.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/saltimer.cxx Mon Feb 24 09:08:02
2014
@@ -71,9 +71,8 @@ void ImplSalStartTimer( sal_uLong nMS )
{
SalData::ensureThreadAutoreleasePool();
// post an event so we can get into the main thread
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: [NSDate
timeIntervalSinceReferenceDate]
windowNumber: 0
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
(original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Mon Feb
24 09:08:02 2014
@@ -643,7 +643,7 @@ static void adjustViewAndChildren( NSVie
NSArray* pSubViews = [pNSView subviews];
unsigned int nViews = [pSubViews count];
- NSRect aUnion = { { 0, 0 }, { 0, 0 } };
+ NSRect aUnion = NSZeroRect;
// get the combined frame of all subviews
for( unsigned int n = 0; n < nViews; n++ )
@@ -712,7 +712,7 @@ static void adjustTabViews( NSTabView* p
static NSControl* createLabel( const rtl::OUString& i_rText )
{
NSString* pText = CreateNSString( i_rText );
- NSRect aTextRect = { { 0, 0 }, {20, 15} };
+ NSRect aTextRect = { NSZeroPoint, {20, 15} };
NSTextField* pTextView = [[NSTextField alloc] initWithFrame: aTextRect];
[pTextView setFont: [NSFont controlContentFontOfSize: 0]];
[pTextView setEditable: NO];
@@ -1093,9 +1093,9 @@ static void addEdit( NSView* pCurParent,
NSView* pCurParent = 0;
long nCurY = 0;
long nCurX = 0;
- NSRect aViewFrame = { { 0, 0 }, {600, 400 } };
+ NSRect aViewFrame = { NSZeroPoint, {600, 400 } };
NSRect aTabViewFrame = { { 190, 0 }, {410, 400 } };
- NSSize aMaxTabSize = { 0, 0 };
+ NSSize aMaxTabSize = NSZeroSize;
NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame];
NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame];
[pAccessoryView addSubview: [pTabView autorelease]];
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm Mon Feb 24
09:08:02 2014
@@ -32,7 +32,7 @@
@implementation AquaPrintView
-(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 )
{
mpController = pController;
@@ -62,8 +62,7 @@
-(NSPoint)locationOfPrintRect: (NSRect)aRect
{
(void)aRect;
- NSPoint aPoint = { 0, 0 };
- return aPoint;
+ return NSZeroPoint;
}
-(void)drawRect: (NSRect)rect
Modified: openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx Mon Feb 24
09:08:02 2014
@@ -209,7 +209,7 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setHasShadow: YES];
[mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)];
- const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth,
maGeometry.nHeight );
+ const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
maSysData.mpNSView = mpNSView;
@@ -745,7 +745,7 @@ void AquaSalFrame::ShowFullScreen( sal_B
// 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];
@@ -1648,7 +1648,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
Modified: openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm Mon Feb 24
09:08:02 2014
@@ -461,7 +461,7 @@ static AquaSalFrame* getMouseContainerFr
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
{
// FIXME: does this leak the returned NSCursor of getCurrentCursor ?
- const NSRect aRect = NSMakeRect( 0, 0, mpFrame->maGeometry.nWidth,
mpFrame->maGeometry.nHeight);
+ const NSRect aRect = { NSZeroPoint, NSMakeSize(
mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight) };
[self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()];
}
}
Modified: openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm Mon Feb 24
09:08:02 2014
@@ -138,7 +138,7 @@
for( size_t i = 0; i < rButtons.size(); ++i )
{
const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
- const NSRect aFromRect = NSMakeRect( 0, 0, aPixSize.Width(),
aPixSize.Height());
+ const NSRect aFromRect = { NSZeroPoint, NSMakeSize(
aPixSize.Width(), aPixSize.Height()) };
aImgRect.origin.y = floor((aFrame.size.height -
aFromRect.size.height)/2);
aImgRect.size = aFromRect.size;
if( rButtons[i].mpNSImage )
@@ -161,7 +161,7 @@
for( size_t i = 0; i < rButtons.size(); ++i )
{
const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
- const NSRect aFromRect = NSMakeRect( 0, 0, aPixSize.Width(),
aPixSize.Height());
+ const NSRect aFromRect = { NSZeroPoint, NSMakeSize(
aPixSize.Width(), aPixSize.Height()) };
aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2;
aImgRect.size = aFromRect.size;
if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <=
(aImgRect.origin.x+aImgRect.size.width) &&
Modified: openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx?rev=1571189&r1=1571188&r2=1571189&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx Mon Feb 24 09:08:02
2014
@@ -47,7 +47,7 @@ AquaSalObject::AquaSalObject( AquaSalFra
maSysData.nSize = sizeof( maSysData );
maSysData.mpNSView = NULL;
- NSRect aInitFrame = { { 0, 0 }, { 20, 20 } };
+ NSRect aInitFrame = { NSZeroPoint, { 20, 20 } };
mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
if( mpClipView )
{
@@ -168,7 +168,7 @@ void AquaSalObject::SetPosSize( long nX,
void AquaSalObject::setClippedPosSize()
{
- NSRect aViewRect = NSMakeRect( 0, 0, mnWidth, mnHeight);
+ NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) };
if( maSysData.mpNSView )
{
NSView* pNSView = maSysData.mpNSView;
@@ -176,7 +176,7 @@ void AquaSalObject::setClippedPosSize()
}
NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);
- NSPoint aClipPt = NSMakePoint( 0, 0);
+ NSPoint aClipPt = NSZeroPoint;
if( mbClip )
{
aClipViewRect.origin.x += mnClipX;
