You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC

svn commit: r1551937 [26/29] - in /openoffice/branches/ooxml-osba: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/...

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdi.cxx Wed Dec 18 13:27:09 2013
@@ -338,7 +338,7 @@ void AquaSalGraphics::updateResolution()
 {
     DBG_ASSERT( mbWindow, "updateResolution on inappropriate graphics" );
 
-    initResolution( (mbWindow && mpFrame) ?  mpFrame->mpWindow : nil );
+    initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 }
 
 void AquaSalGraphics::initResolution( NSWindow* )
@@ -430,19 +430,19 @@ void AquaSalGraphics::initResolution( NS
     mfFakeDPIScale = 1.0;
 }
 
-void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 {
     if( !mnRealDPIY )
-        initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil );
+        initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 
-    rDPIX = static_cast<long>(mfFakeDPIScale * mnRealDPIX);
-    rDPIY = static_cast<long>(mfFakeDPIScale * mnRealDPIY);
+    rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+    rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
 } 
 
 void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
 {
 	if( !rGraphics.mnRealDPIY && rGraphics.mbWindow && rGraphics.mpFrame )
-		rGraphics.initResolution( rGraphics.mpFrame->mpWindow );
+		rGraphics.initResolution( rGraphics.mpFrame->getNSWindow() );
 
 	mnRealDPIX = rGraphics.mnRealDPIX;
 	mnRealDPIY = rGraphics.mnRealDPIY;
@@ -592,7 +592,7 @@ bool AquaSalGraphics::setClipRegion( con
 
                 if(nH)
                 {
-                    CGRect aRect = {{ aRectIter->Left(), aRectIter->Top() }, { nW, nH }};
+                    const CGRect aRect = CGRectMake( aRectIter->Left(), aRectIter->Top(), nW, nH);
                     CGPathAddRect( mxClipPath, NULL, aRect );
                 }
             }
@@ -676,7 +676,7 @@ void AquaSalGraphics::ImplDrawPixel( lon
 	// overwrite the fill color
 	CGContextSetFillColor( mrContext, rColor.AsArray() );
 	// draw 1x1 rect, there is no pixel drawing in Quartz
-	CGRect aDstRect = {{nX,nY,},{1,1}};
+	const CGRect aDstRect = CGRectMake( nX, nY, 1, 1);
 	CGContextFillRect( mrContext, aDstRect );
     RefreshRect( aDstRect );
     // reset the fill color
@@ -744,13 +744,13 @@ void AquaSalGraphics::drawRect( long nX,
 
 // -----------------------------------------------------------------------
 
-static void getBoundRect( sal_uLong nPoints, const SalPoint *pPtAry, long &rX, long& rY, long& rWidth, long& rHeight )
+static void getBoundRect( sal_uInt32 nPoints, const SalPoint* pPtAry, long &rX, long& rY, long& rWidth, long& rHeight )
 {
     long nX1 = pPtAry->mnX;
     long nX2 = nX1;
     long nY1 = pPtAry->mnY;
     long nY2 = nY1;
-    for( sal_uLong n = 1; n < nPoints; n++ )
+    for( sal_uInt32 n = 1; n < nPoints; ++n )
     {
         if( pPtAry[n].mnX < nX1 )
             nX1 = pPtAry[n].mnX;
@@ -774,7 +774,7 @@ static inline void alignLinePoint( const
     o_fY = static_cast<float>(i_pIn->mnY ) + 0.5;
 }
 
-void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
 {
 	if( nPoints < 1 )
 		return;
@@ -790,7 +790,7 @@ void AquaSalGraphics::drawPolyLine( sal_
 	alignLinePoint( pPtAry, fX, fY );
 	CGContextMoveToPoint( mrContext, fX, fY );
 	pPtAry++;
-	for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+	for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 	{
 	    alignLinePoint( pPtAry, fX, fY );
 	    CGContextAddLineToPoint( mrContext, fX, fY );
@@ -802,7 +802,7 @@ void AquaSalGraphics::drawPolyLine( sal_
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
 {
 	if( nPoints <= 1 )
 		return;
@@ -830,7 +830,7 @@ void AquaSalGraphics::drawPolygon( sal_u
         alignLinePoint( pPtAry, fX, fY );
         CGContextMoveToPoint( mrContext, fX, fY );
         pPtAry++;
-        for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+        for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
         {
             alignLinePoint( pPtAry, fX, fY );
             CGContextAddLineToPoint( mrContext, fX, fY );
@@ -840,7 +840,7 @@ void AquaSalGraphics::drawPolygon( sal_u
     {
         CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
         pPtAry++;
-        for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+        for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
             CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
     }
 
@@ -850,7 +850,7 @@ void AquaSalGraphics::drawPolygon( sal_u
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawPolyPolygon( sal_uLong nPolyCount, const sal_uLong *pPoints, PCONSTSALPOINT  *ppPtAry )
+void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32* pPoints, PCONSTSALPOINT* ppPtAry )
 {
     if( nPolyCount <= 0 )
 		return;
@@ -897,7 +897,7 @@ void AquaSalGraphics::drawPolyPolygon( s
 	{
 	    for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
 	    {
-	        const sal_uLong nPoints = pPoints[nPoly];
+	        const sal_uInt32 nPoints = pPoints[nPoly];
 	        if( nPoints > 1 )
 	        {
 	            const SalPoint *pPtAry = ppPtAry[nPoly];
@@ -905,7 +905,7 @@ void AquaSalGraphics::drawPolyPolygon( s
 	            alignLinePoint( pPtAry, fX, fY );
 	            CGContextMoveToPoint( mrContext, fX, fY );
 	            pPtAry++;
-	            for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+	            for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 	            {
 	                alignLinePoint( pPtAry, fX, fY );
 	                CGContextAddLineToPoint( mrContext, fX, fY );
@@ -918,13 +918,13 @@ void AquaSalGraphics::drawPolyPolygon( s
 	{
 	    for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
 	    {
-	        const sal_uLong nPoints = pPoints[nPoly];
+	        const sal_uInt32 nPoints = pPoints[nPoly];
 	        if( nPoints > 1 )
 	        {
 	            const SalPoint *pPtAry = ppPtAry[nPoly];
 	            CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
 	            pPtAry++;
-	            for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+	            for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 	                CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
 	            CGContextClosePath(mrContext);
 	        }
@@ -1074,21 +1074,21 @@ bool AquaSalGraphics::drawPolyLine( 
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
 {
     return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
 {
     return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*,
+sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
                                              const SalPoint* const*, const sal_uInt8* const* )
 {
     return sal_False;
@@ -1133,7 +1133,7 @@ void AquaSalGraphics::copyBits( const Sa
 
 	DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" );
 
-	const CGPoint aDstPoint = { +rPosAry.mnDestX - rPosAry.mnSrcX, rPosAry.mnDestY - rPosAry.mnSrcY };
+	const CGPoint aDstPoint = CGPointMake( +rPosAry.mnDestX - rPosAry.mnSrcX, rPosAry.mnDestY - rPosAry.mnSrcY);
 	if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight == rPosAry.mnDestHeight) &&
 	    (!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // workaround a Quartz crasher
     {
@@ -1145,7 +1145,7 @@ void AquaSalGraphics::copyBits( const Sa
 			    xCopyContext = mpXorEmulation->GetTargetContext();
 
 	    CGContextSaveGState( xCopyContext );
-	    const CGRect aDstRect = { {rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight} };
+	    const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 	    CGContextClipToRect( xCopyContext, aDstRect );
 
 	    // draw at new destination
@@ -1211,10 +1211,10 @@ void AquaSalGraphics::copyArea( long nDs
 	CGLayerRef xSrcLayer = mxLayer;
 	// TODO: if( mnBitmapDepth > 0 )
 	{
-		const CGSize aSrcSize = { nSrcWidth, nSrcHeight };
+		const CGSize aSrcSize = CGSizeMake( nSrcWidth, nSrcHeight);
 		xSrcLayer = ::CGLayerCreateWithContext( xCopyContext, aSrcSize, NULL );
 		const CGContextRef xSrcContext = CGLayerGetContext( xSrcLayer );
-		CGPoint aSrcPoint = { -nSrcX, -nSrcY };
+		CGPoint aSrcPoint = CGPointMake( -nSrcX, -nSrcY);
 		if( IsFlipped() )
 		{
 			::CGContextTranslateCTM( xSrcContext, 0, +nSrcHeight );
@@ -1225,7 +1225,7 @@ void AquaSalGraphics::copyArea( long nDs
 	}
 
 	// draw at new destination
-	const CGPoint aDstPoint = { +nDstX, +nDstY };
+	const CGPoint aDstPoint = CGPointMake( +nDstX, +nDstY);
 	::CGContextDrawLayerAtPoint( xCopyContext, aDstPoint, xSrcLayer );
 
 	// cleanup
@@ -1249,7 +1249,7 @@ void AquaSalGraphics::drawBitmap( const 
 	if( !xImage )
 		return;
 
-	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
+	const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 	CGContextDrawImage( mrContext, aDstRect, xImage );
 	CGImageRelease( xImage );
 	RefreshRect( aDstRect );
@@ -1259,7 +1259,7 @@ void AquaSalGraphics::drawBitmap( const 
 
 void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,SalColor )
 {
-	DBG_ERROR("not implemented for color masking!");
+	DBG_ERROR( "not implemented for color masking!");
 	drawBitmap( rPosAry, rSalBitmap );
 }
 
@@ -1276,7 +1276,7 @@ void AquaSalGraphics::drawBitmap( const 
 	if( !xMaskedImage )
 		return;
 
-	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
+	const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 	CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
 	CGImageRelease( xMaskedImage );
 	RefreshRect( aDstRect );
@@ -1294,7 +1294,7 @@ void AquaSalGraphics::drawMask( const Sa
 	if( !xImage )
 		return;
 
-	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
+	const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 	CGContextDrawImage( mrContext, aDstRect, xImage );
 	CGImageRelease( xImage );
 	RefreshRect( aDstRect );
@@ -1348,7 +1348,7 @@ SalColor AquaSalGraphics::getPixel( long
 	// copy the requested pixel into the bitmap context
 	if( IsFlipped() )
 		nY = mnHeight - nY;
-	const CGPoint aCGPoint = {-nX, -nY};
+	const CGPoint aCGPoint = CGPointMake( -nX, -nY);
 	CGContextDrawLayerAtPoint( xOnePixelContext, aCGPoint, mxLayer );
 	CGContextRelease( xOnePixelContext );
 
@@ -1419,7 +1419,7 @@ void AquaSalGraphics::invert( long nX, l
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::invert( sal_uLong nPoints, const SalPoint*  pPtAry, SalInvert nSalFlags )
+void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
 {
     CGPoint* CGpoints ;
     if ( CheckContext() )
@@ -1485,7 +1485,7 @@ sal_Bool AquaSalGraphics::drawEPS( long 
 	[NSGraphicsContext setCurrentContext: pDrawNSCtx];
 	
 	// draw the EPS
-	const NSRect aDstRect = {{nX,nY},{nWidth,nHeight}};
+	const NSRect aDstRect = NSMakeRect( nX, nY, nWidth, nHeight);
 	const BOOL bOK = [xEpsImage drawInRect: aDstRect];
 
 	// restore the NSGraphicsContext
@@ -1521,7 +1521,7 @@ bool AquaSalGraphics::drawAlphaBitmap( c
 
     if ( CheckContext() )
     {
-		const CGRect aDstRect = {{rTR.mnDestX, rTR.mnDestY}, {rTR.mnDestWidth, rTR.mnDestHeight}};
+		const CGRect aDstRect = CGRectMake( rTR.mnDestX, rTR.mnDestY, rTR.mnDestWidth, rTR.mnDestHeight);
 		CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
 		RefreshRect( aDstRect );
     }
@@ -1562,7 +1562,7 @@ bool AquaSalGraphics::drawTransformedBit
 	CGContextConcatCTM( mrContext, aCGMat );
 
 	// draw the transformed image
-	const CGRect aSrcRect = {{0,0}, {aSize.Width(), aSize.Height()}};
+	const CGRect aSrcRect = CGRectMake( 0, 0, aSize.Width(), aSize.Height());
 	CGContextDrawImage( mrContext, aSrcRect, xImage );
 	CGImageRelease( xImage );
 	// restore the Quartz graphics state
@@ -1578,14 +1578,14 @@ bool AquaSalGraphics::drawTransformedBit
 bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
                                      long nHeight, sal_uInt8 nTransparency )
 {
-    if( !CheckContext() )
-    	return true;
+	if( !CheckContext() )
+		return true;
     	
 	// save the current state
 	CGContextSaveGState( mrContext );
 	CGContextSetAlpha( mrContext, (100-nTransparency) * (1.0/100) ); 
 
-	CGRect aRect = {{nX,nY},{nWidth-1,nHeight-1}};
+	CGRect aRect = CGRectMake( nX, nY, nWidth-1, nHeight-1);
 	if( IsPenVisible() )
 	{
 		aRect.origin.x += 0.5;
@@ -1852,7 +1852,7 @@ static OSStatus GgoMoveToProc( const Flo
 	return eStatus;
 }
 
-sal_Bool AquaSalGraphics::GetGlyphOutline( long nGlyphId, basegfx::B2DPolyPolygon& rPolyPoly )
+bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly )
 {
 	GgoData aGgoData;
 	aGgoData.mpPolyPoly = &rPolyPoly;
@@ -1860,7 +1860,7 @@ sal_Bool AquaSalGraphics::GetGlyphOutlin
 
 	ATSUStyle rATSUStyle = maATSUStyle;	// TODO: handle glyph fallback when CWS pdffix02 is integrated
 	OSStatus eGgoStatus = noErr;
-	OSStatus eStatus = ATSUGlyphGetCubicPaths( rATSUStyle, nGlyphId,
+	OSStatus eStatus = ATSUGlyphGetCubicPaths( rATSUStyle, aGlyphId,
 		GgoMoveToProc, GgoLineToProc, GgoCurveToProc, GgoClosePathProc,
 		&aGgoData, &eGgoStatus );
 	if( (eStatus != noErr) ) // TODO: why is (eGgoStatus!=noErr) when curves are involved?
@@ -1894,13 +1894,13 @@ long AquaSalGraphics::GetGraphicsWidth()
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::GetGlyphBoundRect( long nGlyphId, Rectangle& rRect )
+bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
 {
 	ATSUStyle rATSUStyle = maATSUStyle;	// TODO: handle glyph fallback
-	GlyphID aGlyphId = nGlyphId;
 	ATSGlyphScreenMetrics aGlyphMetrics;
+	GlyphID nAtsGlyphId = aGlyphId;
 	OSStatus eStatus = ATSUGlyphGetScreenMetrics( rATSUStyle,
-		1, &aGlyphId, 0, FALSE, !mbNonAntialiasedText, &aGlyphMetrics );
+		1, &nAtsGlyphId, 0, FALSE, !mbNonAntialiasedText, &aGlyphMetrics );
 	if( eStatus != noErr )
 		return false;
 
@@ -2248,7 +2248,7 @@ static bool GetRawFontData( const ImplFo
 }
 
 sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
-	const ImplFontData* pFontData, long* pGlyphIDs, sal_uInt8* pEncoding,
+	const ImplFontData* pFontData, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding,
 	sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
 {
 	// TODO: move more of the functionality here into the generic subsetter code
@@ -2278,7 +2278,7 @@ sal_Bool AquaSalGraphics::CreateFontSubs
 		// make the subsetter provide the requested subset
 		FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
 		bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL,
-			pGlyphIDs, pEncoding, nGlyphCount, pGlyphWidths );
+			pGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
 		fclose( pOutFile );
 		return bRC;
 	}
@@ -2324,21 +2324,21 @@ sal_Bool AquaSalGraphics::CreateFontSubs
     for( int i = 0; i < nGlyphCount; ++i )
     {
         aTempEncs[i] = pEncoding[i];
-        sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
-        if( pGlyphIDs[i] & GF_ISCHAR )
+        sal_GlyphId aGlyphId( pGlyphIds[i] & GF_IDXMASK);
+        if( pGlyphIds[i] & GF_ISCHAR )
         {
-            bool bVertical = (pGlyphIDs[i] & GF_ROTMASK) != 0;
-            nGlyphIdx = ::MapChar( pSftFont, static_cast<sal_uInt16>(nGlyphIdx), bVertical );
-            if( nGlyphIdx == 0 && pFontData->IsSymbolFont() )
+            bool bVertical = (pGlyphIds[i] & GF_ROTMASK) != 0;
+            aGlyphId = ::MapChar( pSftFont, static_cast<sal_uInt16>(aGlyphId), bVertical );
+            if( aGlyphId == 0 && pFontData->IsSymbolFont() )
             {
                 // #i12824# emulate symbol aliasing U+FXXX <-> U+0XXX
-                nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
-                nGlyphIdx = (nGlyphIdx & 0xF000) ? (nGlyphIdx & 0x00FF) : (nGlyphIdx | 0xF000 );
-                nGlyphIdx = ::MapChar( pSftFont, static_cast<sal_uInt16>(nGlyphIdx), bVertical );
+                aGlyphId = pGlyphIds[i] & GF_IDXMASK;
+                aGlyphId = (aGlyphId & 0xF000) ? (aGlyphId & 0x00FF) : (aGlyphId | 0xF000 );
+                aGlyphId = ::MapChar( pSftFont, static_cast<sal_uInt16>(aGlyphId), bVertical );
             }
         }
-        aShortIDs[i] = static_cast<sal_uInt16>( nGlyphIdx );
-        if( !nGlyphIdx )
+        aShortIDs[i] = static_cast<sal_uInt16>( aGlyphId );
+        if( !aGlyphId )
             if( nNotDef < 0 )
                 nNotDef = i; // first NotDef glyph found
     }
@@ -2739,7 +2739,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 = CGRectMake( 0, 0, nWidth, nHeight);
 		CGContextDrawImage( mxTargetContext, aFullRect, xXorImage );
 		CGImageRelease( xXorImage );
 	}

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdiutils.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdiutils.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salgdiutils.cxx Wed Dec 18 13:27:09 2013
@@ -198,7 +198,7 @@ bool AquaSalGraphics::CheckContext()
         if( !mrContext )
         {
 	        const CGSize aLayerSize = CGSizeMake( nWidth, nHeight);
-	        NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getWindow()];
+	        NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getNSWindow()];
 	        CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]);
     	    mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL );
 			if( mxLayer )

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salnativewidgets.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salnativewidgets.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salnativewidgets.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salnativewidgets.cxx Wed Dec 18 13:27:09 2013
@@ -430,7 +430,7 @@ sal_Bool AquaSalGraphics::hitTestNativeC
 */
 UInt32 AquaSalGraphics::getState( ControlState nState )
 {
-    bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true;
+    const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true;
     if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive )
     {
         if( (nState & CTRL_STATE_HIDDEN) == 0 )
@@ -450,7 +450,7 @@ UInt32 AquaSalGraphics::getState( Contro
 
 UInt32 AquaSalGraphics::getTrackState( ControlState nState )
 {
-    bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true;
+    const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true;
     if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive )
             return kThemeTrackInactive;
 

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salprn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salprn.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salprn.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salprn.cxx Wed Dec 18 13:27:09 2013
@@ -407,7 +407,7 @@ void AquaSalInfoPrinter::GetPageInfo( co
 {
     if( mpPrintInfo )
     {
-        long nDPIX = 72, nDPIY = 72;
+        sal_Int32 nDPIX = 72, nDPIY = 72;
         mpGraphics->GetResolution( nDPIX, nDPIY );
         const double fXScaling = static_cast<double>(nDPIX)/72.0,
                      fYScaling = static_cast<double>(nDPIY)/72.0;

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salvd.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salvd.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salvd.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salvd.cxx Wed Dec 18 13:27:09 2013
@@ -203,10 +203,10 @@ sal_Bool AquaSalVirtualDevice::SetSize( 
         if( pSalFrame )
         {
             // #i91990#
-            NSWindow* pWindow = pSalFrame->getWindow();
-            if ( pWindow )
+            NSWindow* pNSWindow = pSalFrame->getNSWindow();
+            if ( pNSWindow )
             {
-                NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pWindow];
+                NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pNSWindow];
                 if( pNSContext )
                     xCGContext = reinterpret_cast<CGContextRef>([pNSContext graphicsPort]);                
             }

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframe.cxx Wed Dec 18 13:27:09 2013
@@ -61,8 +61,8 @@ AquaSalFrame* AquaSalFrame::s_pCaptureFr
 // =======================================================================
 
 AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
-    mpWindow(nil),
-    mpView(nil),
+    mpNSWindow(nil),
+    mpNSView(nil),
     mpDockMenuEntry(nil),
     mpGraphics(NULL),
     mpParent(NULL),
@@ -128,12 +128,12 @@ AquaSalFrame::~AquaSalFrame()
     if( mpDockMenuEntry )
         // life cycle comment: the menu has ownership of the item, so no release
         [AquaSalInstance::GetDynamicDockMenu() removeItem: mpDockMenuEntry];
-    if ( mpView ) {
-        [AquaA11yFactory revokeView: mpView];
-        [mpView release];
+    if ( mpNSView ) {
+        [AquaA11yFactory revokeView: mpNSView];
+        [mpNSView release];
     }
-    if ( mpWindow )
-        [mpWindow release];
+    if ( mpNSWindow )
+        [mpNSWindow release];
 }
 
 // -----------------------------------------------------------------------
@@ -142,13 +142,13 @@ void AquaSalFrame::initWindowAndView()
 {
     // initialize mirroring parameters
     // FIXME: screens changing
-    NSScreen * pScreen = [mpWindow screen];
-    if( pScreen == nil )
-        pScreen = [NSScreen mainScreen];
-    maScreenRect = [pScreen frame];
+    NSScreen* pNSScreen = [mpNSWindow screen];
+    if( pNSScreen == nil )
+        pNSScreen = [NSScreen mainScreen];
+    maScreenRect = [pNSScreen frame];
 
     // calculate some default geometry
-    NSRect aVisibleRect = [pScreen visibleFrame];
+    NSRect aVisibleRect = [pNSScreen visibleFrame];
     CocoaToVCL( aVisibleRect );
     
     maGeometry.nX = static_cast<int>(aVisibleRect.origin.x + aVisibleRect.size.width / 10);
@@ -194,8 +194,8 @@ void AquaSalFrame::initWindowAndView()
     // #i91990# support GUI-less (daemon) execution
     @try 
     {
-    mpWindow = [[SalFrameWindow alloc] initWithSalFrame: this];
-    mpView = [[SalFrameView alloc] initWithSalFrame: this];
+        mpNSWindow = [[SalFrameWindow alloc] initWithSalFrame: this];
+        mpNSView = [[SalFrameView alloc] initWithSalFrame: this];
     }
     @catch ( id exception )
     {
@@ -203,20 +203,20 @@ void AquaSalFrame::initWindowAndView()
     }
     
     if( (mnStyle & SAL_FRAME_STYLE_TOOLTIP) )
-        [mpWindow setIgnoresMouseEvents: YES];
+        [mpNSWindow setIgnoresMouseEvents: YES];
     else
-        [mpWindow setAcceptsMouseMovedEvents: YES];
-    [mpWindow setHasShadow: YES];
-    [mpWindow setDelegate: mpWindow];
+        [mpNSWindow setAcceptsMouseMovedEvents: YES];
+    [mpNSWindow setHasShadow: YES];
+    [mpNSWindow setDelegate: mpNSWindow];
     
     const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth, maGeometry.nHeight );
-    mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: nil assumeInside: NO];
+    mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO];
     
-    maSysData.pView = mpView;
+    maSysData.mpNSView = mpNSView;
     
     UpdateFrameGeometry();
     
-    [mpWindow setContentView: mpView];
+    [mpNSWindow setContentView: mpNSView];
 }
 
 // -----------------------------------------------------------------------
@@ -301,14 +301,14 @@ sal_Bool AquaSalFrame::PostEvent( void *
 // -----------------------------------------------------------------------
 void AquaSalFrame::SetTitle(const XubString& rTitle)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
     
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
     NSString* pTitle = CreateNSString( rTitle );
-    [mpWindow setTitle: pTitle];
+    [mpNSWindow setTitle: pTitle];
     
     // create an entry in the dock menu
     const sal_uLong nAppWindowStyle = (SAL_FRAME_STYLE_CLOSEABLE | SAL_FRAME_STYLE_MOVEABLE);
@@ -322,7 +322,7 @@ void AquaSalFrame::SetTitle(const XubStr
                                      action: @selector(dockMenuItemTriggered:)
                                      keyEquivalent: @""
                                      atIndex: 0];
-            [mpDockMenuEntry setTarget: mpWindow];
+            [mpDockMenuEntry setTarget: mpNSWindow];
             
             // TODO: image (either the generic window image or an icon
             // check mark (for "main" window ?)
@@ -356,7 +356,7 @@ void AquaSalFrame::SetRepresentedURL( co
         if( pStr )
         {
             [pStr autorelease];
-            [mpWindow setRepresentedFilename: pStr];
+            [mpNSWindow setRepresentedFilename: pStr];
         }
     }
 }
@@ -397,7 +397,7 @@ void AquaSalFrame::initShow()
     }
     
     // make sure the view is present in the wrapper list before any children receive focus
-    [AquaA11yFactory registerView: mpView];
+    [AquaA11yFactory registerView: mpNSView];
 }
 
 void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
@@ -418,7 +418,7 @@ void AquaSalFrame::SendPaintEvent( const
 
 void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -434,10 +434,10 @@ void AquaSalFrame::Show(sal_Bool bVisibl
         // trigger filling our backbuffer
         SendPaintEvent();
         
-        if( bNoActivate || [mpWindow canBecomeKeyWindow] == NO )
-            [mpWindow orderFront: NSApp];
+        if( bNoActivate || [mpNSWindow canBecomeKeyWindow] == NO )
+            [mpNSWindow orderFront: NSApp];
         else
-            [mpWindow makeKeyAndOrderFront: NSApp];
+            [mpNSWindow makeKeyAndOrderFront: NSApp];
         
         if( mpParent )
         {
@@ -450,12 +450,12 @@ void AquaSalFrame::Show(sal_Bool bVisibl
             */
             if( mpParent->mbShown || (mnStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_FLOAT) ) )
             {
-                [mpParent->mpWindow addChildWindow: mpWindow ordered: NSWindowAbove];
+                [mpParent->mpNSWindow addChildWindow: mpNSWindow ordered: NSWindowAbove];
             }
         }
         
         if( mbPresentation )
-            [mpWindow makeMainWindow];
+            [mpNSWindow makeMainWindow];
     }
     else
     {
@@ -466,14 +466,14 @@ void AquaSalFrame::Show(sal_Bool bVisibl
 
         // #i90440# #i94443# work around the focus going back to some other window
         // if a child gets hidden for a parent window
-        if( mpParent && mpParent->mbShown && [mpWindow isKeyWindow] )
-            [mpParent->mpWindow makeKeyAndOrderFront: NSApp];
+        if( mpParent && mpParent->mbShown && [mpNSWindow isKeyWindow] )
+            [mpParent->mpNSWindow makeKeyAndOrderFront: NSApp];
         
         [SalFrameView unsetMouseFrame: this];
-        if( mpParent && [mpWindow parentWindow] == mpParent->mpWindow )
-            [mpParent->mpWindow removeChildWindow: mpWindow];
+        if( mpParent && [mpNSWindow parentWindow] == mpParent->mpNSWindow )
+            [mpParent->mpNSWindow removeChildWindow: mpNSWindow];
         
-        [mpWindow orderOut: NSApp];
+        [mpNSWindow orderOut: NSApp];
     }
 }
 
@@ -493,7 +493,7 @@ void AquaSalFrame::SetMinClientSize( lon
     mnMinWidth = nWidth;
     mnMinHeight = nHeight;
 
-    if( mpWindow )
+    if( mpNSWindow )
     {
         // Always add the decoration as the dimension concerns only
         // the content rectangle
@@ -504,7 +504,7 @@ void AquaSalFrame::SetMinClientSize( lon
 
         // Size of full window (content+structure) although we only
         // have the client size in arguments
-        [mpWindow setMinSize: aSize];
+        [mpNSWindow setMinSize: aSize];
     }
 }
 
@@ -518,7 +518,7 @@ void AquaSalFrame::SetMaxClientSize( lon
     mnMaxWidth = nWidth;
     mnMaxHeight = nHeight;
 
-    if( mpWindow )
+    if( mpNSWindow )
     {
         // Always add the decoration as the dimension concerns only
         // the content rectangle
@@ -533,7 +533,7 @@ void AquaSalFrame::SetMaxClientSize( lon
 
         // Size of full window (content+structure) although we only
         // have the client size in arguments
-        [mpWindow setMaxSize: aSize];
+        [mpNSWindow setMaxSize: aSize];
     }
 }
 
@@ -544,11 +544,11 @@ void AquaSalFrame::SetClientSize( long n
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    if( mpWindow )
+    if( mpNSWindow )
     {
         const NSSize aSize = NSMakeSize( nWidth, nHeight);
         
-        [mpWindow setContentSize: aSize];
+        [mpNSWindow setContentSize: aSize];
         UpdateFrameGeometry();
         if( mbShown )
             // trigger filling our backbuffer
@@ -579,10 +579,10 @@ void AquaSalFrame::SetWindowState( const
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    if ( mpWindow )
+    if ( mpNSWindow )
     {
     // set normal state
-    NSRect aStateRect = [mpWindow frame];
+    NSRect aStateRect = [mpNSWindow frame];
     aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
     CocoaToVCL( aStateRect );
     if( pState->mnMask & SAL_FRAMESTATE_MASK_X )
@@ -596,11 +596,11 @@ void AquaSalFrame::SetWindowState( const
     VCLToCocoa( aStateRect );
     aStateRect = [NSWindow frameRectForContentRect: aStateRect styleMask: mnStyleMask];
     
-    [mpWindow setFrame: aStateRect display: NO];
+    [mpNSWindow setFrame: aStateRect display: NO];
     if( pState->mnState == SAL_FRAMESTATE_MINIMIZED )
-        [mpWindow miniaturize: NSApp];
-    else if( [mpWindow isMiniaturized] )
-        [mpWindow deminiaturize: NSApp];
+        [mpNSWindow miniaturize: NSApp];
+    else if( [mpNSWindow isMiniaturized] )
+        [mpNSWindow deminiaturize: NSApp];
         
 
     /* ZOOMED is not really maximized (actually it toggles between a user set size and
@@ -609,13 +609,13 @@ void AquaSalFrame::SetWindowState( const
     */
     if( pState->mnState == SAL_FRAMESTATE_MAXIMIZED )
     {
-        if(! [mpWindow isZoomed])
-            [mpWindow zoom: NSApp];
+        if(! [mpNSWindow isZoomed])
+            [mpNSWindow zoom: NSApp];
     }
     else
     {
-        if( [mpWindow isZoomed] )
-            [mpWindow zoom: NSApp];
+        if( [mpNSWindow isZoomed] )
+            [mpNSWindow zoom: NSApp];
     }
     }
 
@@ -638,13 +638,13 @@ void AquaSalFrame::SetWindowState( const
     if( nEvent )
         CallCallback( nEvent, NULL );
 
-    if( mbShown && mpWindow )
+    if( mbShown && mpNSWindow )
     {
         // trigger filling our backbuffer
         SendPaintEvent();
 
         // tell the system the views need to be updated
-        [mpWindow display];
+        [mpNSWindow display];
     }
 }
 
@@ -652,7 +652,7 @@ void AquaSalFrame::SetWindowState( const
 
 sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return FALSE;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -670,7 +670,7 @@ sal_Bool AquaSalFrame::GetWindowState( S
                      #endif
                      SAL_FRAMESTATE_MASK_STATE;
 
-    NSRect aStateRect = [mpWindow frame];
+    NSRect aStateRect = [mpNSWindow frame];
     aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
     CocoaToVCL( aStateRect );
     pState->mnX         = long(aStateRect.origin.x);
@@ -678,9 +678,9 @@ sal_Bool AquaSalFrame::GetWindowState( S
     pState->mnWidth     = long(aStateRect.size.width);
     pState->mnHeight    = long(aStateRect.size.height);
     
-    if( [mpWindow isMiniaturized] )
+    if( [mpNSWindow isMiniaturized] )
         pState->mnState = SAL_FRAMESTATE_MINIMIZED;
-    else if( ! [mpWindow isZoomed] )
+    else if( ! [mpNSWindow isZoomed] )
         pState->mnState = SAL_FRAMESTATE_NORMAL;
     else
         pState->mnState = SAL_FRAMESTATE_MAXIMIZED;
@@ -692,7 +692,7 @@ sal_Bool AquaSalFrame::GetWindowState( S
 
 void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -708,17 +708,17 @@ void AquaSalFrame::SetScreenNumber(unsig
         NSRect aNewScreen = [pScreen frame];
         
         // get current screen frame
-        pScreen = [mpWindow screen];
+        pScreen = [mpNSWindow screen];
         if( pScreen )
         {
             NSRect aCurScreen = [pScreen frame];
             if( aCurScreen.origin.x != aNewScreen.origin.x ||
                 aCurScreen.origin.y != aNewScreen.origin.y )
             {
-                NSRect aFrameRect = [mpWindow frame];
+                NSRect aFrameRect = [mpNSWindow frame];
                 aFrameRect.origin.x += aNewScreen.origin.x - aCurScreen.origin.x;
                 aFrameRect.origin.y += aNewScreen.origin.y - aCurScreen.origin.y;
-                [mpWindow setFrame: aFrameRect display: NO];
+                [mpNSWindow setFrame: aFrameRect display: NO];
                 UpdateFrameGeometry();
             }
         }
@@ -729,7 +729,7 @@ void AquaSalFrame::SetScreenNumber(unsig
 
 void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -781,7 +781,7 @@ void AquaSalFrame::ShowFullScreen( sal_B
         if( aNewContentRect.size.width == 0 && aNewContentRect.size.height == 0 )
         {
             if( pScreen == nil )
-                pScreen = [mpWindow screen];
+                pScreen = [mpNSWindow screen];
             if( pScreen == nil )
                 pScreen = [NSScreen mainScreen];
             
@@ -791,9 +791,9 @@ void AquaSalFrame::ShowFullScreen( sal_B
         if( bHideMenu )
             [NSMenu setMenuBarVisible:NO];
 
-	    maFullScreenRect = [mpWindow frame];
+	    maFullScreenRect = [mpNSWindow frame];
         {
-            [mpWindow setFrame: [NSWindow frameRectForContentRect: aNewContentRect styleMask: mnStyleMask] display: mbShown ? YES : NO];
+            [mpNSWindow setFrame: [NSWindow frameRectForContentRect: aNewContentRect styleMask: mnStyleMask] display: mbShown ? YES : NO];
         }
 
 	    UpdateFrameGeometry();
@@ -804,7 +804,7 @@ void AquaSalFrame::ShowFullScreen( sal_B
 	else
 	{
         {
-            [mpWindow setFrame: maFullScreenRect display: mbShown ? YES : NO];
+            [mpNSWindow setFrame: maFullScreenRect display: mbShown ? YES : NO];
         }
 	    UpdateFrameGeometry();
 
@@ -842,7 +842,7 @@ public:
 
 void AquaSalFrame::StartPresentation( sal_Bool bStart )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -852,15 +852,15 @@ void AquaSalFrame::StartPresentation( sa
     {
         GetSalData()->maPresentationFrames.push_back( this );
         mpActivityTimer.reset( new PreventSleepTimer() );
-        [mpWindow setLevel: NSPopUpMenuWindowLevel];
+        [mpNSWindow setLevel: NSPopUpMenuWindowLevel];
         if( mbShown )
-            [mpWindow makeMainWindow];
+            [mpNSWindow makeMainWindow];
     }
     else
     {
         GetSalData()->maPresentationFrames.remove( this );
         mpActivityTimer.reset();
-        [mpWindow setLevel: NSNormalWindowLevel];
+        [mpNSWindow setLevel: NSNormalWindowLevel];
     }
 }
 
@@ -874,7 +874,7 @@ void AquaSalFrame::SetAlwaysOnTop( sal_B
 
 void AquaSalFrame::ToTop(sal_uInt16 nFlags)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -885,13 +885,13 @@ void AquaSalFrame::ToTop(sal_uInt16 nFla
     
     if( ! (nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN) )
     {
-        if( ! [mpWindow isVisible] || [mpWindow isMiniaturized] )
+        if( ! [mpNSWindow isVisible] || [mpNSWindow isMiniaturized] )
             return;
     }
     if( nFlags & SAL_FRAME_TOTOP_GRABFOCUS )
-        [mpWindow makeKeyAndOrderFront: NSApp];
+        [mpNSWindow makeKeyAndOrderFront: NSApp];
     else
-        [mpWindow orderFront: NSApp];
+        [mpNSWindow orderFront: NSApp];
 }
 
 // -----------------------------------------------------------------------
@@ -936,7 +936,7 @@ NSCursor* AquaSalFrame::getCurrentCursor
 
 void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -946,7 +946,7 @@ void AquaSalFrame::SetPointer( PointerSt
         return;
     mePointerStyle = ePointerStyle;
     
-    [mpWindow invalidateCursorRectsForView: mpView];
+    [mpNSWindow invalidateCursorRectsForView: mpNSView];
 }
 
 // -----------------------------------------------------------------------
@@ -965,21 +965,21 @@ void AquaSalFrame::SetPointerPos( long n
 
 void AquaSalFrame::Flush( void )
 {
-    if( !(mbGraphics && mpGraphics && mpView && mbShown) )
+    if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
 
-    [mpView setNeedsDisplay: YES];
+    [mpNSView setNeedsDisplay: YES];
 
     // outside of the application's event loop (e.g. IntroWindow)
     // nothing would trigger paint event handling
     // => fall back to synchronous painting
     if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
     {
-        [mpView display];
+        [mpNSView display];
     }
 }
 
@@ -987,7 +987,7 @@ void AquaSalFrame::Flush( void )
 
 void AquaSalFrame::Flush( const Rectangle& rRect )
 {
-    if( !(mbGraphics && mpGraphics && mpView && mbShown) )
+    if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
@@ -995,14 +995,14 @@ void AquaSalFrame::Flush( const Rectangl
     
     NSRect aNSRect = NSMakeRect( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight());
     VCLToCocoa( aNSRect, false );
-    [mpView setNeedsDisplayInRect: aNSRect];
+    [mpNSView setNeedsDisplayInRect: aNSRect];
 
     // outside of the application's event loop (e.g. IntroWindow)
     // nothing would trigger paint event handling
     // => fall back to synchronous painting
     if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
     {
-        [mpView display];
+        [mpNSView display];
     }
 }
 
@@ -1010,13 +1010,13 @@ void AquaSalFrame::Flush( const Rectangl
 
 void AquaSalFrame::Sync()
 {
-    if( mbGraphics && mpGraphics && mpView && mbShown )
+    if( mbGraphics && mpGraphics && mpNSView && mbShown )
     {
         // #i113170# may not be the main thread if called from UNO API
         SalData::ensureThreadAutoreleasePool();
     
-        [mpView setNeedsDisplay: YES];
-        [mpView display];
+        [mpNSView setNeedsDisplay: YES];
+        [mpNSView display];
     }
 }
 
@@ -1219,7 +1219,7 @@ static Font getFont( NSFont* pFont, long
     return aResult;
 }
 
-void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
+void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY )
 {
     if( ! mpGraphics )
     {
@@ -1237,13 +1237,13 @@ void AquaSalFrame::getResolution( long& 
 // doesn't make the anything cleaner for now
 void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    [mpView lockFocus];
+    [mpNSView lockFocus];
     
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
 
@@ -1264,7 +1264,7 @@ void AquaSalFrame::UpdateSettings( AllSe
 
     // get the system font settings
     Font aAppFont = aStyleSettings.GetAppFont();
-	long nDPIX = 72, nDPIY = 72;
+	sal_Int32 nDPIX = 72, nDPIY = 72;
 	getResolution( nDPIX, nDPIY );
     aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
 
@@ -1291,22 +1291,22 @@ void AquaSalFrame::UpdateSettings( AllSe
 	aStyleSettings.SetIconFont( aLabelFont );
 
     Color aHighlightColor( getColor( [NSColor selectedTextBackgroundColor],
-                                      aStyleSettings.GetHighlightColor(), mpWindow ) );
+                                      aStyleSettings.GetHighlightColor(), mpNSWindow ) );
     aStyleSettings.SetHighlightColor( aHighlightColor );
     Color aHighlightTextColor( getColor( [NSColor selectedTextColor],
-                                         aStyleSettings.GetHighlightTextColor(), mpWindow ) );
+                                         aStyleSettings.GetHighlightTextColor(), mpNSWindow ) );
     aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
     
     Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
-                                         aStyleSettings.GetMenuHighlightColor(), mpWindow ) );
+                                         aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) );
     aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
     Color aMenuHighlightTextColor( getColor( [NSColor selectedMenuItemTextColor],
-                                             aStyleSettings.GetMenuHighlightTextColor(), mpWindow ) );
+                                             aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) );
     aStyleSettings.SetMenuHighlightTextColor( aMenuHighlightTextColor );
     
     aStyleSettings.SetMenuColor( aBackgroundColor );
     Color aMenuTextColor( getColor( [NSColor textColor],
-                                    aStyleSettings.GetMenuTextColor(), mpWindow ) );
+                                    aStyleSettings.GetMenuTextColor(), mpNSWindow ) );
     aStyleSettings.SetMenuTextColor( aMenuTextColor );
     aStyleSettings.SetMenuBarTextColor( aMenuTextColor );
 
@@ -1325,7 +1325,7 @@ void AquaSalFrame::UpdateSettings( AllSe
     
     rSettings.SetStyleSettings( aStyleSettings );
 
-    [mpView unlockFocus];
+    [mpNSView unlockFocus];
 }
 
 // -----------------------------------------------------------------------
@@ -1354,7 +1354,7 @@ void AquaSalFrame::Beep( SoundType eSoun
 
 void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
@@ -1362,8 +1362,8 @@ void AquaSalFrame::SetPosSize(long nX, l
     
     sal_uInt16 nEvent = 0;
 
-    if( [mpWindow isMiniaturized] )
-        [mpWindow deminiaturize: NSApp]; // expand the window
+    if( [mpNSWindow isMiniaturized] )
+        [mpNSWindow deminiaturize: NSApp]; // expand the window
 
     if (nFlags & (SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y))
     {
@@ -1377,7 +1377,7 @@ void AquaSalFrame::SetPosSize(long nX, l
         nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE;
     }
 
-    NSRect aFrameRect = [mpWindow frame];
+    NSRect aFrameRect = [mpNSWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
     
     // position is always relative to parent frame
@@ -1392,7 +1392,7 @@ void AquaSalFrame::SetPosSize(long nX, l
             else
                 nX = mpParent->maGeometry.nWidth - static_cast<long int>( aContentRect.size.width-1) - nX;
         }
-        NSRect aParentFrameRect = [mpParent->mpWindow frame];
+        NSRect aParentFrameRect = [mpParent->mpNSWindow frame];
         aParentContentRect = [NSWindow contentRectForFrameRect: aParentFrameRect styleMask: mpParent->mnStyleMask];
     }
     else
@@ -1424,7 +1424,7 @@ void AquaSalFrame::SetPosSize(long nX, l
 
     // do not display yet, we need to update our backbuffer
     {
-        [mpWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
+        [mpNSWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
     }
     
     UpdateFrameGeometry();
@@ -1438,19 +1438,19 @@ void AquaSalFrame::SetPosSize(long nX, l
         SendPaintEvent();
 
         // now inform the system that the views need to be drawn
-        [mpWindow display];
+        [mpNSWindow display];
     }
 }
 
 void AquaSalFrame::GetWorkArea( Rectangle& rRect )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    NSScreen* pScreen = [mpWindow screen];
+    NSScreen* pScreen = [mpNSWindow screen];
     if( pScreen ==  nil )
         pScreen = [NSScreen mainScreen];
     NSRect aRect = [pScreen visibleFrame];
@@ -1470,7 +1470,7 @@ SalPointerState	AquaSalFrame::GetPointer
     state.mnState = 0;
     
     // get position
-    NSPoint aPt = [mpWindow mouseLocationOutsideOfEventStream];
+    NSPoint aPt = [mpNSWindow mouseLocationOutsideOfEventStream];
     CocoaToVCL( aPt, false );
     state.maPos = Point(static_cast<long>(aPt.x), static_cast<long>(aPt.y));
 
@@ -1585,13 +1585,13 @@ void AquaSalFrame::SetMenu( SalMenu* pSa
 
 void AquaSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
 {
-    if ( mpWindow ) 
+    if ( mpNSWindow ) 
     {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
     if( (mnExtStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) != (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) )
-        [mpWindow setDocumentEdited: (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) ? YES : NO];
+        [mpNSWindow setDocumentEdited: (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) ? YES : NO];
     }
     
     mnExtStyle = nStyle;
@@ -1624,7 +1624,7 @@ void AquaSalFrame::SetParent( SalFrame* 
 
 void AquaSalFrame::UpdateFrameGeometry()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1633,7 +1633,7 @@ void AquaSalFrame::UpdateFrameGeometry()
     // whereas vcl's are upper left
     
     // update screen rect
-    NSScreen * pScreen = [mpWindow screen];
+    NSScreen * pScreen = [mpNSWindow screen];
     if( pScreen )
     {
         maScreenRect = [pScreen frame];
@@ -1642,14 +1642,14 @@ void AquaSalFrame::UpdateFrameGeometry()
             maGeometry.nScreenNumber = [pScreens indexOfObject: pScreen];
     }
     
-    NSRect aFrameRect = [mpWindow frame];
+    NSRect aFrameRect = [mpNSWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
 
     // release old track rect
-    [mpView removeTrackingRect: mnTrackingRectTag];
+    [mpNSView removeTrackingRect: mnTrackingRectTag];
     // install the new track rect
     NSRect aTrackRect = { { 0, 0 }, aContentRect.size };
-    mnTrackingRectTag = [mpView addTrackingRect: aTrackRect owner: mpView userData: nil assumeInside: NO];
+    mnTrackingRectTag = [mpNSView addTrackingRect: aTrackRect owner: mpNSView userData: nil assumeInside: NO];
 
     // convert to vcl convention
     CocoaToVCL( aFrameRect );
@@ -1701,7 +1701,7 @@ void AquaSalFrame::CaptureMouse( sal_Boo
 
 void AquaSalFrame::ResetClipRegion()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1713,18 +1713,18 @@ void AquaSalFrame::ResetClipRegion()
     CGPathRelease( mrClippingPath );
     mrClippingPath = NULL;
     
-    if( mpView && mbShown )
-        [mpView setNeedsDisplay: YES];
-    if( mpWindow )
+    if( mpNSView && mbShown )
+        [mpNSView setNeedsDisplay: YES];
+    if( mpNSWindow )
     {
-        [mpWindow setOpaque: YES];
-        [mpWindow invalidateShadow];
+        [mpNSWindow setOpaque: YES];
+        [mpNSWindow invalidateShadow];
     }
 }
 
 void AquaSalFrame::BeginSetClipRegion( sal_uLong nRects )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1763,7 +1763,7 @@ void AquaSalFrame::UnionClipRegion( long
 
 void AquaSalFrame::EndSetClipRegion()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1776,12 +1776,12 @@ void AquaSalFrame::EndSetClipRegion()
         mrClippingPath = CGPathCreateMutable();
         CGPathAddRects( mrClippingPath, NULL, &maClippingRects[0], maClippingRects.size() );
     }
-    if( mpView && mbShown )
-        [mpView setNeedsDisplay: YES];
-    if( mpWindow )
+    if( mpNSView && mbShown )
+        [mpNSView setNeedsDisplay: YES];
+    if( mpNSWindow )
     {
-        [mpWindow setOpaque: (mrClippingPath != NULL) ? NO : YES];
-        [mpWindow setBackgroundColor: [NSColor clearColor]];
+        [mpNSWindow setOpaque: (mrClippingPath != NULL) ? NO : YES];
+        [mpNSWindow setBackgroundColor: [NSColor clearColor]];
         // shadow is invalidated when view gets drawn again
     }
 }

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframeview.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframeview.mm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salframeview.mm Wed Dec 18 13:27:09 2013
@@ -436,7 +436,7 @@ static AquaSalFrame* getMouseContainerFr
 
 -(id)initWithSalFrame: (AquaSalFrame*)pFrame
 {
-    if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil)
+    if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getNSWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil)
     {
         mDraggingDestinationHandler = nil;
         mpFrame = pFrame;
@@ -526,7 +526,7 @@ private:
         {
             mpFrame->mpGraphics->UpdateWindow( aRect );
             if( mpFrame->getClipPath() )
-                [mpFrame->getWindow() invalidateShadow];
+                [mpFrame->getNSWindow() invalidateShadow];
         }
     }
 }
@@ -559,7 +559,7 @@ private:
     {
         // is this event actually inside that NSWindow ?
         NSPoint aPt = [NSEvent mouseLocation];
-        NSRect aFrameRect = [pDispatchFrame->getWindow() frame];
+        NSRect aFrameRect = [pDispatchFrame->getNSWindow() frame];
         
 	if ( ! NSPointInRect( aPt, aFrameRect ) )
         {
@@ -1698,7 +1698,7 @@ private:
 }
 
 -(id)parentAttribute {
-    return (NSView *) mpFrame -> mpWindow;
+    return mpFrame->getNSWindow();
 }
 
 -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext
@@ -1716,9 +1716,9 @@ private:
     return [ super accessibleContext ];
 }
 
--(NSView *)viewElementForParent
+-(NSView*)viewElementForParent
 {
-    return (NSView *) mpFrame -> mpWindow;
+    return mpFrame->getNSView();
 }
 
 -(void)registerMouseEventListener: (id)theListener

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salmenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salmenu.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salmenu.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salmenu.cxx Wed Dec 18 13:27:09 2013
@@ -351,9 +351,9 @@ bool AquaSalMenu::ShowNativePopupMenu(Fl
 
     // get the pointers
     AquaSalFrame * pParentAquaSalFrame = (AquaSalFrame *) pWin->ImplGetWindowImpl()->mpRealParent->ImplGetFrame();
-    NSWindow * pParentNSWindow = pParentAquaSalFrame->mpWindow;
-    NSView * pParentNSView = [pParentNSWindow contentView];
-    NSView * pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpView;
+    NSWindow* pParentNSWindow = pParentAquaSalFrame->mpNSWindow;
+    NSView* pParentNSView = [pParentNSWindow contentView];
+    NSView* pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpNSView;
     NSRect popupFrame = [pPopupNSView frame];
     
     // since we manipulate the menu below (removing entries)
@@ -800,9 +800,9 @@ void AquaSalMenu::statusLayout()
 {
     if( GetSalData()->mpStatusItem )
     {
-        NSView* pView = [GetSalData()->mpStatusItem view];
-        if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
-            [(OOStatusItemView*)pView layout];
+        NSView* pNSView = [GetSalData()->mpStatusItem view];
+        if( [pNSView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
+            [(OOStatusItemView*)pNSView layout];
         else
             DBG_ERROR( "someone stole our status view" );
     }
@@ -883,15 +883,15 @@ Rectangle AquaSalMenu::GetMenuBarButtonR
     if( ! pItem )
         return Rectangle();
     
-    NSView* pView = [pItem view];
-    if( ! pView )
+    NSView* pNSView = [pItem view];
+    if( ! pNSView )
         return Rectangle();
-    NSWindow* pWin = [pView window];
-    if( ! pWin )
+    NSWindow* pNSWin = [pNSView window];
+    if( ! pNSWin )
         return Rectangle();
 
-    NSRect aRect = [pWin frame];
-    aRect.origin = [pWin convertBaseToScreen: NSMakePoint( 0, 0 )];
+    NSRect aRect = [pNSWin frame];
+    aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )];
     
     // make coordinates relative to reference frame
     static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin );

Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salobj.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salobj.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/window/salobj.cxx Wed Dec 18 13:27:09 2013
@@ -45,20 +45,20 @@ AquaSalObject::AquaSalObject( AquaSalFra
     mnHeight( 20 )
 {
     maSysData.nSize = sizeof( maSysData );
-    maSysData.pView = NULL;
+    maSysData.mpNSView = NULL;
     
     NSRect aInitFrame = { { 0, 0 }, { 20, 20 } };
     mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
     if( mpClipView )
     {
-        [mpFrame->getView() addSubview: mpClipView];
+        [mpFrame->getNSView() addSubview: mpClipView];
         [mpClipView setHidden: YES];
     }
-    maSysData.pView = [[NSView alloc] initWithFrame: aInitFrame];
-    if( maSysData.pView )
+    maSysData.mpNSView = [[NSView alloc] initWithFrame: aInitFrame];
+    if( maSysData.mpNSView )
     {
         if( mpClipView )
-            [mpClipView setDocumentView: maSysData.pView];
+            [mpClipView setDocumentView: maSysData.mpNSView];
     }
 }
 
@@ -66,9 +66,9 @@ AquaSalObject::AquaSalObject( AquaSalFra
 
 AquaSalObject::~AquaSalObject()
 {
-    if( maSysData.pView )
+    if( maSysData.mpNSView )
     {
-        NSView *pView = maSysData.pView;
+        NSView *pView = maSysData.mpNSView;
         [pView removeFromSuperview];
         [pView release];
     }
@@ -169,10 +169,10 @@ void AquaSalObject::SetPosSize( long nX,
 void AquaSalObject::setClippedPosSize()
 {
     NSRect aViewRect = NSMakeRect( 0, 0, mnWidth, mnHeight);
-    if( maSysData.pView )
+    if( maSysData.mpNSView )
     {
-        NSView *pView = maSysData.pView;
-        [pView setFrame: aViewRect];
+        NSView* pNSView = maSysData.mpNSView;
+        [pNSView setFrame: aViewRect];
     }
     
     NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salframe.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salframe.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salframe.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salframe.h Wed Dec 18 13:27:09 2013
@@ -54,8 +54,8 @@ typedef struct SalFrame::SalPointerState
 class AquaSalFrame : public SalFrame
 {
 public:
-    NSWindow*                       mpWindow;               // Cocoa window
-	NSView*                         mpView;				    // Cocoa view (actually a custom view, see below
+	NSWindow*                       mpNSWindow;             // Cocoa window
+	NSView*                         mpNSView;               // Cocoa view (actually a custom view)
     NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
     NSRect                          maScreenRect;           // for mirroring purposes
 	AquaSalGraphics*		        mpGraphics; 			// current frame graphics
@@ -175,11 +175,11 @@ public:
     
     static AquaSalFrame* GetCaptureFrame() { return s_pCaptureFrame; }
     
-    NSWindow* getWindow() const { return mpWindow; }
-    NSView* getView() const { return mpView; }
+    NSWindow* getNSWindow() const { return mpNSWindow; }
+    NSView* getNSView() const { return mpNSView; }
     unsigned int getStyleMask() const { return mnStyleMask; }
     
-    void getResolution( long& o_rDPIX, long& o_rDPIY );
+    void getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY );
     
     // actually the follwing methods do the same thing: flipping y coordinates
     // but having two of them makes clearer what the coordinate system

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salgdi.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/aqua/salgdi.h Wed Dec 18 13:27:09 2013
@@ -179,13 +179,13 @@ public:
     virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
     virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void		drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void		drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void		drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void		drawPolyPolygon( sal_uLong nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual void		drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual sal_Bool	drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool	drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool	drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
     virtual bool        drawPolyLine( 
         const ::basegfx::B2DPolygon&, 
         double fTransparency, 
@@ -216,7 +216,7 @@ public:
 
     // invert --> ClipRegion (only Windows or VirDevs)
     virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void		invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void		invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
     virtual sal_Bool		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
 
@@ -248,7 +248,7 @@ public:
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     // get device resolution
-    virtual void			GetResolution( long& rDPIX, long& rDPIY );
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
     // get the depth of the device
     virtual sal_uInt16			GetBitCount();
     // get the width of the device
@@ -303,7 +303,7 @@ public:
     // as "undefined character"
     virtual sal_Bool			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
-                                              long* pGlyphIDs,
+                                              sal_GlyphId* pGlyphIds,
                                               sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
@@ -339,8 +339,8 @@ public:
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
 
-    virtual sal_Bool                    GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual sal_Bool                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& );
+    virtual bool                    GetGlyphBoundRect( sal_GlyphId, Rectangle& );
+    virtual bool                    GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void					 DrawServerFontLayout( const ServerFontLayout& );

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/fontsubset.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/fontsubset.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/fontsubset.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/fontsubset.hxx Wed Dec 18 13:27:09 2013
@@ -28,6 +28,7 @@
 #include <tools/string.hxx>
 #include <cstdio>
 
+#include "salglyphid.hxx"
 #include "vcl/dllapi.h"
 
 namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font
@@ -58,7 +59,7 @@ public:
 
 	bool		CreateFontSubset( int nOutFontTypeMask,
 					FILE* pOutFile, const char* pOutFontName,
-					const long* pReqGlyphIds, const sal_uInt8* pEncodedIds,
+					const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncodedIds,
 					int nReqGlyphCount, sal_Int32* pOutGlyphWidths = NULL );
 
 public: // TODO: make subsetter results private and provide accessor methods instead
@@ -81,7 +82,7 @@ private:
 	int						mnReqFontTypeMask;	// allowed subset-target font types
 	FILE*					mpOutFile;
 	const char*				mpReqFontName;
-	const long*				mpReqGlyphIds;
+	const sal_GlyphId*		mpReqGlyphIds;
 	const sal_uInt8*		mpReqEncodedIds;
 	int						mnReqGlyphCount;
 

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/glyphcache.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/glyphcache.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/glyphcache.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/glyphcache.hxx Wed Dec 18 13:27:09 2013
@@ -80,7 +80,7 @@ private:
     friend class ServerFont;
     // used by ServerFont class only
     void                        AddedGlyph( ServerFont&, GlyphData& );
-    void                        RemovingGlyph( ServerFont&, GlyphData&, int nGlyphIndex );
+    void                        RemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId );
     void                        UsingGlyph( ServerFont&, GlyphData& );
     void                        GrowNotify();
 
@@ -188,16 +188,16 @@ public:
     virtual const ImplFontCharMap* GetImplFontCharMap() const = 0;
     Point                       TransformPoint( const Point& ) const;
 
-    GlyphData&                  GetGlyphData( int nGlyphIndex );
-    const GlyphMetric&          GetGlyphMetric( int nGlyphIndex )
-                                { return GetGlyphData( nGlyphIndex ).GetMetric(); }
+    GlyphData&                  GetGlyphData( sal_GlyphId );
+    const GlyphMetric&          GetGlyphMetric( sal_GlyphId aGlyphId )
+                                { return GetGlyphData( aGlyphId ).GetMetric(); }
 
-    virtual int                 GetGlyphIndex( sal_UCS4 ) const = 0;
-    virtual bool                GetGlyphOutline( int nGlyphIndex, ::basegfx::B2DPolyPolygon& ) const = 0;
+    virtual sal_GlyphId         GetGlyphIndex( sal_UCS4 ) const = 0;
+    virtual bool                GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) const = 0;
     virtual bool                GetAntialiasAdvice( void ) const = 0;
-    bool                        IsGlyphInvisible( int nGlyphIndex );
-    virtual bool                GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const = 0;
-    virtual bool                GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const = 0;
+    bool                        IsGlyphInvisible( sal_GlyphId );
+    virtual bool                GetGlyphBitmap1( sal_GlyphId, RawBitmap& ) const = 0;
+    virtual bool                GetGlyphBitmap8( sal_GlyphId, RawBitmap& ) const = 0;
 
     void                        SetExtended( int nInfo, void* ppVoid );
     int                         GetExtInfo() { return mnExtInfo; }
@@ -214,7 +214,7 @@ protected:
     long                        Release() const;
     sal_uLong                       GetByteCount() const { return mnBytesUsed; }
 
-    virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const = 0;
+    virtual void                InitGlyphData( sal_GlyphId, GlyphData& ) const = 0;
     virtual void                GarbageCollect( long );
     void                        ReleaseFromGarbageCollect();
 

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/graphite_layout.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/graphite_layout.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/graphite_layout.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/graphite_layout.hxx Wed Dec 18 13:27:09 2013
@@ -48,12 +48,6 @@
 #include <vcl/dllapi.h>
 // Module
 
-// For backwards compatibility with 2.4.x
-#if (SUPD == 680)
-typedef sal_Int32 sal_GlyphId;
-#endif
-
-
 // Module type definitions and forward declarations.
 //
 class TextSourceAdaptor;

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/ilstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/ilstbox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/ilstbox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/ilstbox.hxx Wed Dec 18 13:27:09 2013
@@ -250,10 +250,8 @@ private:
 	Link			maDoubleClickHdl;
 	Link			maUserDrawHdl;
 	Link			maMRUChangedHdl;
-//IAccessibility2 Implementation 2009-----
 	Link			maFocusHdl;
 	Link			maListItemSelectHdl;
-//-----IAccessibility2 Implementation 2009
 
     ::vcl::QuickSelectionEngine maQuickSelectionEngine;
 
@@ -267,10 +265,8 @@ protected:
 	virtual void	GetFocus();
 	virtual void	LoseFocus();
 
-	//IAccessibility2 Implementation 2009-----
 	//sal_Bool			SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
 	sal_Bool			SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False );
-	//-----IAccessibility2 Implementation 2009
 	void			ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false );
     void			ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
 	void			ImplCalcMetrics();
@@ -367,13 +363,11 @@ public:
 	const Link& 	GetUserDrawHdl() const				{ return maUserDrawHdl; }
 	void			SetMRUChangedHdl( const Link& rLink )	{ maMRUChangedHdl = rLink; }
 	const Link& 	GetMRUChangedHdl() const				{ return maMRUChangedHdl; }
-//IAccessibility2 Implementation 2009-----
 	void			SetFocusHdl( const Link& rLink )	{ maFocusHdl = rLink ; }
 	const Link& 	GetFocusHdl() const				{ return maFocusHdl; }
 
 	void			SetListItemSelectHdl( const Link& rLink )	{ maListItemSelectHdl = rLink ; }
 	const Link& 	GetListItemSelectHdl() const				{ return maListItemSelectHdl; }
-//-----IAccessibility2 Implementation 2009
 	bool			IsSelectionChanged() const { return mbSelectionChanged; }
 	sal_uInt16			GetSelectModifier() const { return mnSelectModifier; }
 
@@ -510,12 +504,10 @@ public:
 	void			SetUserDrawHdl( const Link& rLink )	{ maLBWindow.SetUserDrawHdl( rLink ); }
 	const Link& 	GetUserDrawHdl() const				{ return maLBWindow.GetUserDrawHdl(); }
 
-//IAccessibility2 Implementation 2009-----
 	void			SetFocusHdl( const Link& rLink )	{ maLBWindow.SetFocusHdl( rLink ); }
 	const Link& 	GetFocusHdl() const				{ return maLBWindow.GetFocusHdl(); }
 	void			SetListItemSelectHdl( const Link& rLink )	{ maLBWindow.SetListItemSelectHdl( rLink ); }
 	const Link& 	GetListItemSelectHdl() const	{ return maLBWindow.GetListItemSelectHdl(); }
-//-----IAccessibility2 Implementation 2009
 	void			SetSelectionChangedHdl( const Link& rLnk )	{ maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); }
 	void			SetCallSelectionChangedHdl( sal_Bool bCall )	{ maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
 	sal_Bool			IsSelectionChanged() const 					{ return maLBWindow.IsSelectionChanged(); }

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/os2/salgdi.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/os2/salgdi.h (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/os2/salgdi.h Wed Dec 18 13:27:09 2013
@@ -162,9 +162,9 @@ protected:
     virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
     virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void		drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void		drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void		drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void		drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual void		drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
+    virtual void		drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool        drawPolyLine( 
         const ::basegfx::B2DPolygon&, 
@@ -172,8 +172,8 @@ protected:
         const ::basegfx::B2DVector& rLineWidth, 
         basegfx::B2DLineJoin,
         com::sun::star::drawing::LineCap);
-    virtual sal_Bool	drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool	drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
     virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
 
     // CopyArea --> No RasterOp, but ClipRegion
@@ -199,7 +199,7 @@ protected:
 
     // invert --> ClipRegion (only Windows or VirDevs)
     virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void		invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
     virtual sal_Bool		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
@@ -233,7 +233,7 @@ public:
     // public SalGraphics methods, the interface to teh independent vcl part
 
     // get device resolution
-    virtual void			GetResolution( long& rDPIX, long& rDPIY );
+    virtual void			GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
     // get the depth of the device
     virtual USHORT			GetBitCount();
     // get the width of the device
@@ -288,7 +288,7 @@ public:
     // as "undefined character"
     virtual sal_Bool			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
-                                              long* pGlyphIDs,
+                                              sal_GlyphId* pGlyphIds,
                                               sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
@@ -324,8 +324,8 @@ public:
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
 
-    virtual sal_Bool                    GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual sal_Bool                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual bool                    GetGlyphBoundRect( sal_GlyphId, Rectangle& );
+    virtual bool                    GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void					 DrawServerFontLayout( const ServerFontLayout& );

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/salgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/salgdi.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/salgdi.hxx Wed Dec 18 13:27:09 2013
@@ -29,6 +29,7 @@
 #include "vcl/sv.h"
 #include "vcl/dllapi.h"
 #include "vcl/salgtype.hxx"
+#include "salglyphid.hxx"
 #include "vos/thread.hxx"
 #include "vcl/outdev.hxx"
 #include "vcl/salnativewidgets.hxx"
@@ -116,8 +117,8 @@ protected:
     virtual void		drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
     virtual void		drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0;
     virtual void		drawRect( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual void		drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) = 0;
-    virtual void		drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) = 0;
+    virtual void		drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0;
+    virtual void		drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0;
     virtual void		drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0;
     virtual bool        drawPolyLine( 
@@ -126,8 +127,8 @@ protected:
         const ::basegfx::B2DVector& rLineWidths, 
         basegfx::B2DLineJoin,
         com::sun::star::drawing::LineCap) = 0;
-    virtual sal_Bool	drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
-    virtual sal_Bool	drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+    virtual sal_Bool	drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+    virtual sal_Bool	drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
     virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0;
 
     // CopyArea --> No RasterOp, but ClipRegion
@@ -153,7 +154,7 @@ protected:
 
     // invert --> ClipRegion (only Windows or VirDevs)
     virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0;
-    virtual void		invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
+    virtual void		invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
 
     virtual sal_Bool		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0;
 
@@ -264,7 +265,7 @@ public:
     // as "undefined character"
     virtual sal_Bool			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
-                                              sal_Int32* pGlyphIDs,
+                                              sal_GlyphId* pGlyphIds,
                                               sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
@@ -306,8 +307,8 @@ public:
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) = 0;
 
-    virtual sal_Bool                    GetGlyphBoundRect( long nIndex, Rectangle& ) = 0;
-    virtual sal_Bool                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0;
+    virtual bool                    GetGlyphBoundRect( sal_GlyphId, Rectangle& ) = 0;
+    virtual bool                    GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) = 0;
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0;
     virtual void					 DrawServerFontLayout( const ServerFontLayout& ) = 0;
@@ -369,8 +370,8 @@ public:
     void                    DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev );
     void                    DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev );
     void                    DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
-    void                    DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
-    void                    DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
+    void                    DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
+    void                    DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
     void                    DrawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry,
@@ -385,11 +386,11 @@ public:
         com::sun::star::drawing::LineCap i_eLineCap,
         const OutputDevice* i_pOutDev);
 
-    sal_Bool                DrawPolyLineBezier( sal_uLong nPoints,
+    sal_Bool                DrawPolyLineBezier( sal_uInt32 nPoints,
                                                 const SalPoint* pPtAry,
                                                 const sal_uInt8* pFlgAry,
                                                 const OutputDevice *pOutDev );
-    sal_Bool                DrawPolygonBezier( sal_uLong nPoints,
+    sal_Bool                DrawPolygonBezier( sal_uInt32 nPoints,
                                                const SalPoint* pPtAry,
                                                const sal_uInt8* pFlgAry,
                                                const OutputDevice *pOutDev );
@@ -437,7 +438,7 @@ public:
 
     // invert --> ClipRegion (only Windows)
     void                    Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev );
-    void                    Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
+    void                    Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
 
     sal_Bool                    DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev );
 

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/sallayout.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/sallayout.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/sallayout.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/sallayout.hxx Wed Dec 18 13:27:09 2013
@@ -38,6 +38,7 @@ typedef unsigned short LanguageType;
 
 // for typedef sal_UCS4
 #include <vcl/vclenum.hxx>
+#include "salglyphid.hxx"
 
 class SalGraphics;
 class ImplFontData;
@@ -146,28 +147,6 @@ VCL_PLUGIN_PUBLIC const char* GetAutofal
 // - SalLayout -
 // -------------
 
-typedef sal_uInt32 sal_GlyphId;
-
-// Glyph Flags
-#define GF_NONE     0x00000000
-#define GF_FLAGMASK 0xFF800000
-#define GF_IDXMASK  ~GF_FLAGMASK
-#define GF_ISCHAR   0x00800000
-#define GF_ROTL     0x01000000
-// caution !!!
-#define GF_VERT     0x02000000
-// GF_VERT is only for windows implementation
-// (win/source/gdi/salgdi3.cxx, win/source/gdi/winlayout.cxx)
-// don't use this elsewhere !!!
-#define GF_ROTR     0x03000000
-#define GF_ROTMASK  0x03000000
-#define GF_UNHINTED 0x04000000
-#define GF_GSUB     0x08000000
-#define GF_FONTMASK 0xF0000000
-#define GF_FONTSHIFT 28
-
-#define GF_DROPPED  0xFFFFFFFF
-
 // all positions/widths are in font units
 // one exception: drawposition is in pixel units
 
@@ -306,17 +285,17 @@ struct GlyphItem
     int     mnCharPos;      // index in string
     int     mnOrigWidth;    // original glyph width
     int     mnNewWidth;     // width after adjustments
-    sal_GlyphId mnGlyphIndex;
+    sal_GlyphId maGlyphId;
     Point   maLinearPos;    // absolute position of non rotated string
 
 public:
             GlyphItem() {}
 
-            GlyphItem( int nCharPos, sal_GlyphId nGlyphIndex, const Point& rLinearPos,
+            GlyphItem( int nCharPos, sal_GlyphId aGlyphId, const Point& rLinearPos,
                 long nFlags, int nOrigWidth )
             :   mnFlags(nFlags), mnCharPos(nCharPos),
                 mnOrigWidth(nOrigWidth), mnNewWidth(nOrigWidth),
-                mnGlyphIndex(nGlyphIndex), maLinearPos(rLinearPos)
+                maGlyphId(aGlyphId), maLinearPos(rLinearPos)
             {}
 
     enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 };

Modified: openoffice/branches/ooxml-osba/main/vcl/inc/svdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/inc/svdata.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/inc/svdata.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/inc/svdata.hxx Wed Dec 18 13:27:09 2013
@@ -182,9 +182,7 @@ struct ImplSVAppData
      */
     ImeStatusWindowMode meShowImeStatusWindow;
 
-//IAccessibility2 Implementation 2009-----
 	long m_bEnableAccessInterface;
-//-----IAccessibility2 Implementation 2009
                             DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
                            
 };