[Libreoffice-commits] .: 3 commits - sal/inc solenv/gbuild vcl/aqua
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 9 15:22:56 PST 2012
sal/inc/rtl/ustrbuf.hxx | 7 ---
solenv/gbuild/platform/macosx.mk | 3 +
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 2 -
vcl/aqua/source/app/salinst.cxx | 2 -
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 2 -
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 6 +--
vcl/aqua/source/gdi/aquaprintview.mm | 2 -
vcl/aqua/source/gdi/atsui/salatslayout.cxx | 2 -
vcl/aqua/source/gdi/salbmp.cxx | 4 +-
vcl/aqua/source/gdi/salgdicommon.cxx | 36 +++++++++----------
vcl/aqua/source/gdi/salgdiutils.cxx | 2 -
vcl/aqua/source/gdi/salprn.cxx | 2 -
vcl/aqua/source/gdi/salvd.cxx | 2 -
vcl/aqua/source/window/salframe.cxx | 14 +++----
vcl/aqua/source/window/salframeview.mm | 6 +--
vcl/aqua/source/window/salnsmenu.mm | 15 ++++---
vcl/aqua/source/window/salobj.cxx | 4 +-
17 files changed, 53 insertions(+), 58 deletions(-)
New commits:
commit 782c243045a1c7ee95b2d7ea6bca64812a9049e1
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 10 01:19:27 2012 +0200
Fix error: no matching function for call to 'sal_n_array_size'
Change-Id: I8c5eb0f36d2be76182c3aae68fd9fa0b25a624c5
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 80ec5c3..01dbde5 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -515,7 +515,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
if ([systemDataFlavor caseInsensitiveCompare: flavorMap[i].SystemFlavor] == NSOrderedSame)
{
oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor);
- oOOFlavor.HumanPresentableName = OUString(RTL_CONSTASCII_USTRINGPARAM(flavorMap[i].HumanPresentableName));
+ oOOFlavor.HumanPresentableName = OUString::createFromAscii(flavorMap[i].HumanPresentableName);
oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? getCppuType( (OUString*)0 ) : getCppuType((Sequence<sal_Int8>*)0);
return oOOFlavor;
}
commit e8edaed36e50ee33d1d241ce7ebfbeb0911ccf02
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 10 01:08:40 2012 +0200
WaE: narrowing from int/long to float in initializer list (-Wc++11-narrowing)
Warnings from Clang now with -std=gnu++0x.
Change-Id: I3a77e3171b0a298d8a35dd18270453a8a0bc4f07
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 74f8153..db4e94e 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -98,7 +98,7 @@ using namespace ::rtl;
+(void)addColor:(sal_Int32)salColor forAttribute:(NSString *)attribute andRange:(NSRange)range toString:(NSMutableAttributedString *)string {
if ( salColor != -1 ) {
- CGFloat elements[] = { salColor & 0x00ff0000, salColor & 0x0000ff00, salColor & 0x000000ff };
+ CGFloat elements[] = { static_cast<CGFloat>(salColor & 0x00ff0000), static_cast<CGFloat>(salColor & 0x0000ff00), static_cast<CGFloat>(salColor & 0x000000ff) };
CGColorRef color = CGColorCreate ( CGColorSpaceCreateWithName ( kCGColorSpaceGenericRGB ), elements );
[ string addAttribute: attribute value: (id) color range: range ];
CGColorRelease ( color );
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 90a3fa7..715005d 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -1303,7 +1303,7 @@ NSImage* CreateNSImage( const Image& rImage )
NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]);
- const CGRect aDstRect = { {0, 0}, { aSize.Width(), aSize.Height() } };
+ const CGRect aDstRect = { {0, 0}, { static_cast<CGFloat>(aSize.Width()), static_cast<CGFloat>(aSize.Height()) } };
CGContextDrawImage( rCGContext, aDstRect, xImage );
[pImage unlockFocus];
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 643b6df..3dba1c4 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -799,7 +799,7 @@ static void addBool( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
ControlTarget* pCtrlTarget
)
{
- NSRect aCheckRect = { { rCurX + nAttachOffset, 0 }, { 0, 15 } };
+ NSRect aCheckRect = { { static_cast<CGFloat>(rCurX + nAttachOffset), 0 }, { 0, 15 } };
NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
[pBtn setButtonType: NSSwitchButton];
[pBtn setState: bValue ? NSOnState : NSOffState];
@@ -868,7 +868,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach
// setup radio matrix
NSButtonCell* pProto = [[NSButtonCell alloc] init];
- NSRect aRadioRect = { { rCurX + nOff, 0 }, { 280 - rCurX, 5*rChoices.getLength() } };
+ NSRect aRadioRect = { { static_cast<CGFloat>(rCurX + nOff), 0 }, { static_cast<CGFloat>(280 - rCurX), static_cast<CGFloat>(5*rChoices.getLength()) } };
[pProto setTitle: @"RadioButtonGroup"];
[pProto setButtonType: NSRadioButton];
NSMatrix* pMatrix = [[NSMatrix alloc] initWithFrame: aRadioRect
@@ -1002,7 +1002,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
nOff = aTextRect.size.width + 5;
}
- NSRect aFieldRect = { { rCurX + nOff + nAttachOffset, 0 }, { 100, 25 } };
+ NSRect aFieldRect = { { static_cast<CGFloat>(rCurX + nOff + nAttachOffset), 0 }, { 100, 25 } };
NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
[pFieldView setEditable: YES];
[pFieldView setSelectable: YES];
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index 90a3915..d7957ee 100644
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -49,7 +49,7 @@
// #i101108# sanity check
if( nWidth < 1 )
nWidth = 1;
- NSRect aRect = { { page % nWidth, page / nWidth }, aPaperSize };
+ NSRect aRect = { { static_cast<CGFloat>(page % nWidth), static_cast<CGFloat>(page / nWidth) }, aPaperSize };
return aRect;
}
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index a9c1288..1c6dafd 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -236,7 +236,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
#endif
// create the ATSUI layout
- UniCharCount nRunLengths[1] = { mnCharCount };
+ UniCharCount nRunLengths[1] = { static_cast<UniCharCount>(mnCharCount) };
const int nRunCount = sizeof(nRunLengths)/sizeof(*nRunLengths);
OSStatus eStatus = ATSUCreateTextLayoutWithTextPtr( rArgs.mpStr,
rArgs.mnMinCharPos, mnCharCount, rArgs.mnLength,
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 5b0f2eb..8d8afa2 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -88,7 +88,7 @@ bool AquaSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits,
CreateContext();
// copy layer content into the bitmap buffer
- const CGPoint aSrcPoint = { -nX, -nY };
+ const CGPoint aSrcPoint = { static_cast<CGFloat>(-nX), static_cast<CGFloat>(-nY) };
::CGContextDrawLayerAtPoint( mxGraphicContext, aSrcPoint, xLayer );
return true;
}
@@ -731,7 +731,7 @@ CGImageRef AquaSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int
else
{
nY = mnHeight - (nY + nNewHeight); // adjust for y-mirrored context
- const CGRect aCropRect = {{nX, nY}, {nNewWidth, nNewHeight}};
+ const CGRect aCropRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nNewWidth), static_cast<CGFloat>(nNewHeight) } };
xCroppedImage = CGImageCreateWithImageInRect( mxCachedImage, aCropRect );
}
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index 8485e00..4fbca5a 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -323,7 +323,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap
DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" );
- const CGPoint aDstPoint = { +pPosAry->mnDestX - pPosAry->mnSrcX, pPosAry->mnDestY - pPosAry->mnSrcY };
+ const CGPoint aDstPoint = { static_cast<CGFloat>(+pPosAry->mnDestX - pPosAry->mnSrcX), static_cast<CGFloat>(pPosAry->mnDestY - pPosAry->mnSrcY) };
if( (pPosAry->mnSrcWidth == pPosAry->mnDestWidth &&
pPosAry->mnSrcHeight == pPosAry->mnDestHeight) &&
(!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // workaround a Quartz crasher
@@ -339,7 +339,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap
}
}
CGContextSaveGState( xCopyContext );
- const CGRect aDstRect = { {pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight} };
+ const CGRect aDstRect = { { static_cast<CGFloat>(pPosAry->mnDestX), static_cast<CGFloat>(pPosAry->mnDestY) }, { static_cast<CGFloat>(pPosAry->mnDestWidth), static_cast<CGFloat>(pPosAry->mnDestHeight) } };
CGContextClipToRect( xCopyContext, aDstRect );
// draw at new destination
@@ -456,10 +456,10 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY,
CGLayerRef xSrcLayer = mxLayer;
// TODO: if( mnBitmapDepth > 0 )
{
- const CGSize aSrcSize = { nSrcWidth, nSrcHeight };
+ const CGSize aSrcSize = { static_cast<CGFloat>(nSrcWidth), static_cast<CGFloat>(nSrcHeight) };
xSrcLayer = ::CGLayerCreateWithContext( xCopyContext, aSrcSize, NULL );
const CGContextRef xSrcContext = CGLayerGetContext( xSrcLayer );
- CGPoint aSrcPoint = { -nSrcX, -nSrcY };
+ CGPoint aSrcPoint = { static_cast<CGFloat>(-nSrcX), static_cast<CGFloat>(-nSrcY) };
if( IsFlipped() )
{
::CGContextTranslateCTM( xSrcContext, 0, +nSrcHeight );
@@ -470,7 +470,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY,
}
// draw at new destination
- const CGPoint aDstPoint = { +nDstX, +nDstY };
+ const CGPoint aDstPoint = { static_cast<CGFloat>(+nDstX), static_cast<CGFloat>(+nDstY) };
::CGContextDrawLayerAtPoint( xCopyContext, aDstPoint, xSrcLayer );
// cleanup
@@ -521,7 +521,7 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
}
if ( CheckContext() )
{
- const CGRect aDstRect = {{rTR.mnDestX, rTR.mnDestY}, {rTR.mnDestWidth, rTR.mnDestHeight}};
+ const CGRect aDstRect = { { static_cast<CGFloat>(rTR.mnDestX), static_cast<CGFloat>(rTR.mnDestY) }, { static_cast<CGFloat>(rTR.mnDestWidth), static_cast<CGFloat>(rTR.mnDestHeight) } };
CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
RefreshRect( aDstRect );
}
@@ -541,7 +541,7 @@ bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
CGContextSaveGState( mrContext );
CGContextSetAlpha( mrContext, (100-nTransparency) * (1.0/100) );
- CGRect aRect = {{nX,nY},{nWidth-1,nHeight-1}};
+ CGRect aRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nWidth-1), static_cast<CGFloat>(nHeight-1) } };
if( IsPenVisible() )
{
aRect.origin.x += 0.5;
@@ -571,8 +571,8 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
{
return;
}
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY},
- {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = { { static_cast<CGFloat>(pPosAry->mnDestX), static_cast<CGFloat>(pPosAry->mnDestY) },
+ { static_cast<CGFloat>(pPosAry->mnDestWidth), static_cast<CGFloat>(pPosAry->mnDestHeight) } };
CGContextDrawImage( mrContext, aDstRect, xImage );
CGImageRelease( xImage );
RefreshRect( aDstRect );
@@ -599,8 +599,8 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
{
return;
}
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY},
- {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = { { static_cast<CGFloat>(pPosAry->mnDestX), static_cast<CGFloat>(pPosAry->mnDestY)},
+ { static_cast<CGFloat>(pPosAry->mnDestWidth), static_cast<CGFloat>(pPosAry->mnDestHeight) } };
CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
CGImageRelease( xMaskedImage );
RefreshRect( aDstRect );
@@ -637,7 +637,7 @@ sal_Bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
[NSGraphicsContext setCurrentContext: pDrawNSCtx];
// draw the EPS
- const NSRect aDstRect = {{nX,nY},{nWidth,nHeight}};
+ const NSRect aDstRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) } };
const BOOL bOK = [xEpsImage drawInRect: aDstRect];
// restore the NSGraphicsContext
@@ -688,8 +688,8 @@ void AquaSalGraphics::drawMask( const SalTwoRect* pPosAry,
{
return;
}
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY},
- {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = { { static_cast<CGFloat>(pPosAry->mnDestX), static_cast<CGFloat>(pPosAry->mnDestY) },
+ { static_cast<CGFloat>(pPosAry->mnDestWidth), static_cast<CGFloat>(pPosAry->mnDestHeight) } };
CGContextDrawImage( mrContext, aDstRect, xImage );
CGImageRelease( xImage );
RefreshRect( aDstRect );
@@ -1150,7 +1150,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
{
nY = mnHeight - nY;
}
- const CGPoint aCGPoint = {-nX, -nY};
+ const CGPoint aCGPoint = { static_cast<CGFloat>(-nX), static_cast<CGFloat>(-nY) };
CGContextDrawLayerAtPoint( xOnePixelContext, aCGPoint, mxLayer );
CGContextRelease( xOnePixelContext );
@@ -1178,7 +1178,7 @@ void AquaSalGraphics::ImplDrawPixel( long nX, long nY, const RGBAColor& rColor )
// overwrite the fill color
CGContextSetFillColor( mrContext, rColor.AsArray() );
// draw 1x1 rect, there is no pixel drawing in Quartz
- CGRect aDstRect = {{nX,nY,},{1,1}};
+ CGRect aDstRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, {1,1}};
CGContextFillRect( mrContext, aDstRect );
RefreshRect( aDstRect );
// reset the fill color
@@ -1457,7 +1457,7 @@ bool AquaSalGraphics::setClipRegion( const Region& i_rClip )
{
if( nW && nH )
{
- CGRect aRect = {{nX,nY}, {nW,nH}};
+ CGRect aRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nW), static_cast<CGFloat>(nH) } };
CGPathAddRect( mxClipPath, NULL, aRect );
}
bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH );
@@ -1687,7 +1687,7 @@ bool XorEmulation::UpdateTarget()
const int nWidth = (int)CGImageGetWidth( xXorImage );
const int nHeight = (int)CGImageGetHeight( xXorImage );
// TODO: update minimal changerect
- const CGRect aFullRect = {{0,0},{nWidth,nHeight}};
+ const CGRect aFullRect = { {0, 0}, { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) } };
CGContextDrawImage( m_xTargetContext, aFullRect, xXorImage );
CGImageRelease( xXorImage );
}
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 8de1da1..a6ffc0c 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -189,7 +189,7 @@ bool AquaSalGraphics::CheckContext()
if( !mrContext )
{
- const CGSize aLayerSize = {nWidth,nHeight};
+ const CGSize aLayerSize = { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) };
NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getWindow()];
CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]);
mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL );
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index da2014d..dab0bb9 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -229,7 +229,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
}
else if( i_nWidth > 0 && i_nHeight > 0 )
{
- NSSize aPaperSize = { TenMuToPt(i_nWidth), TenMuToPt(i_nHeight) };
+ NSSize aPaperSize = { static_cast<CGFloat>(TenMuToPt(i_nWidth)), static_cast<CGFloat>(TenMuToPt(i_nHeight)) };
[mpPrintInfo setPaperSize: aPaperSize];
}
// this seems counterintuitive
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 9696b9a..36d9c7c 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -214,7 +214,7 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
DBG_ASSERT( xCGContext, "no context" );
- const CGSize aNewSize = { nDX, nDY };
+ const CGSize aNewSize = { static_cast<CGFloat>(nDX), static_cast<CGFloat>(nDY) };
mxLayer = CGLayerCreateWithContext( xCGContext, aNewSize, NULL );
if( mxLayer && mpGraphics )
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index d2e616c..5aa6f0f 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -217,7 +217,7 @@ void AquaSalFrame::initWindowAndView()
{
objc_msgSend(mpWindow, @selector(setRestorable:), NO);
}
- NSRect aRect = { { 0,0 }, { maGeometry.nWidth, maGeometry.nHeight } };
+ NSRect aRect = { { 0,0 }, { static_cast<CGFloat>(maGeometry.nWidth), static_cast<CGFloat>(maGeometry.nHeight) } };
mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: nil assumeInside: NO];
maSysData.pView = mpView;
@@ -508,7 +508,7 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
nWidth += maGeometry.nLeftDecoration + maGeometry.nRightDecoration;
nHeight += maGeometry.nTopDecoration + maGeometry.nBottomDecoration;
- NSSize aSize = { nWidth, nHeight };
+ NSSize aSize = { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) };
// Size of full window (content+structure) although we only
// have the client size in arguments
@@ -537,7 +537,7 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
if (nWidth>32767) nWidth=32767;
if (nHeight>32767) nHeight=32767;
- NSSize aSize = { nWidth, nHeight };
+ NSSize aSize = { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) };
// Size of full window (content+structure) although we only
// have the client size in arguments
@@ -554,7 +554,7 @@ void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
if( mpWindow )
{
- NSSize aSize = { nWidth, nHeight };
+ NSSize aSize = { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) };
[mpWindow setContentSize: aSize];
UpdateFrameGeometry();
@@ -962,7 +962,7 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
// FIXME: use Cocoa functions
// FIXME: multiscreen support
- CGPoint aPoint = { nX + maGeometry.nX, nY + maGeometry.nY };
+ CGPoint aPoint = { static_cast<CGFloat>(nX + maGeometry.nX), static_cast<CGFloat>(nY + maGeometry.nY) };
CGDirectDisplayID mainDisplayID = CGMainDisplayID();
CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
}
@@ -999,7 +999,7 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
- NSRect aNSRect = { {rRect.Left(), rRect.Top()}, { rRect.GetWidth(), rRect.GetHeight() } };
+ NSRect aNSRect = { { static_cast<CGFloat>(rRect.Left()), static_cast<CGFloat>(rRect.Top()) }, { static_cast<CGFloat>(rRect.GetWidth()), static_cast<CGFloat>(rRect.GetHeight()) } };
VCLToCocoa( aNSRect, false );
[mpView setNeedsDisplayInRect: aNSRect];
@@ -1743,7 +1743,7 @@ void AquaSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
if( nWidth && nHeight )
{
- NSRect aRect = { { nX, nY }, { nWidth, nHeight } };
+ NSRect aRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) } };
VCLToCocoa( aRect, false );
maClippingRects.push_back( CGRectMake(aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height) );
}
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 5567260..d6861a4 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -143,8 +143,8 @@ static AquaSalFrame* getMouseContainerFrame()
{
mDraggingDestinationHandler = nil;
mpFrame = pFrame;
- NSRect aRect = { { pFrame->maGeometry.nX, pFrame->maGeometry.nY },
- { pFrame->maGeometry.nWidth, pFrame->maGeometry.nHeight } };
+ NSRect aRect = { { static_cast<CGFloat>(pFrame->maGeometry.nX), static_cast<CGFloat>(pFrame->maGeometry.nY) },
+ { static_cast<CGFloat>(pFrame->maGeometry.nWidth), static_cast<CGFloat>(pFrame->maGeometry.nHeight) } };
pFrame->VCLToCocoa( aRect );
NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
[pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver
@@ -410,7 +410,7 @@ static AquaSalFrame* getMouseContainerFrame()
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
{
// FIXME: does this leak the returned NSCursor of getCurrentCursor ?
- NSRect aRect = { { 0, 0 }, { mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight } };
+ NSRect aRect = { { 0, 0 }, { static_cast<CGFloat>(mpFrame->maGeometry.nWidth), static_cast<CGFloat>(mpFrame->maGeometry.nHeight) } };
[self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()];
}
}
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index 3163b87..39c36ae 100644
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -132,8 +132,8 @@
for( size_t i = 0; i < rButtons.size(); ++i )
{
NSRect aFromRect = { { 0, 0 },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ { static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()),
+ static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
aImgRect.origin.y = floor((aFrame.size.height - aFromRect.size.height)/2);
aImgRect.size = aFromRect.size;
if( rButtons[i].mpNSImage )
@@ -156,8 +156,8 @@
for( size_t i = 0; i < rButtons.size(); ++i )
{
NSRect aFromRect = { { 0, 0 },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ { static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()),
+ static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().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) &&
@@ -189,9 +189,10 @@
aSize.width = 2;
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aImgRect = { { aSize.width, floor((aSize.height-rButtons[i].maButton.maImage.GetSizePixel().Height())/2) },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ NSRect aImgRect = { { static_cast<CGFloat>(aSize.width),
+ static_cast<CGFloat>(floor((aSize.height-rButtons[i].maButton.maImage.GetSizePixel().Height())/2)) },
+ { static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()),
+ static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
if( rButtons[i].mpToolTipString )
[self addToolTipRect: aImgRect owner: rButtons[i].mpToolTipString userData: NULL];
aSize.width += 2 + aImgRect.size.width;
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 3280367..abf085c 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -162,14 +162,14 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
void AquaSalObject::setClippedPosSize()
{
- NSRect aViewRect = { { 0, 0 }, { mnWidth, mnHeight } };
+ NSRect aViewRect = { { 0, 0 }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } };
if( maSysData.pView )
{
NSView *pView = maSysData.pView;
[pView setFrame: aViewRect];
}
- NSRect aClipViewRect = { { mnX, mnY }, { mnWidth, mnHeight } };
+ NSRect aClipViewRect = { { static_cast<CGFloat>(mnX), static_cast<CGFloat>(mnY) }, { static_cast<CGFloat>(mnWidth), static_cast<CGFloat>(mnHeight) } };
NSPoint aClipPt = { 0, 0 };
if( mbClip )
{
commit a55c3a3875bb78fd7d2e802cde89f690e0d7fbfa
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Dec 9 23:45:02 2012 +0200
Avoid "deleted function definitions are a C++11 extension" in a better way
Tell also Apple's Clang to compile to the "gnu++0x" standard.
Change-Id: Ia9f5f2f5a62ac8c0cbbfbbdffede6f308aea8534
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 9850bfa..3814a6f 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -579,17 +579,10 @@ public:
// Pointer can be automatically converted to bool, which is unwanted here.
// Explicitly delete all pointer append() overloads to prevent this
// (except for char* and sal_Unicode* overloads, which are handled elsewhere).
-#if defined(__clang__) && defined(LIBO_WERROR)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wc++11-extensions"
-#endif
template< typename T >
typename internal::Enable< void,
!internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type
append( T* ) = delete;
-#if defined(__clang__) && defined(LIBO_WERROR)
-#pragma GCC diagnostic pop
-#endif
#endif
#endif
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3a6f097..5c590bc 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -64,7 +64,8 @@ gb_CXXFLAGS := \
-Wno-non-virtual-dtor \
-fno-strict-aliasing \
-fsigned-char \
- $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \
+ $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-std=gnu++0x,-malign-natural) \
+
#-Wshadow \ break in compiler headers already
#-fsigned-char \ might be removed?
#-malign-natural \ might be removed?
More information about the Libreoffice-commits
mailing list