svn commit: r1550761 - in /openoffice/branches/rejuvenate01/main/vcl/aqua/source: gdi/ctfonts.cxx gdi/salgdiutils.cxx window/salframe.cxx

[hdu]

Author: hdu
Date: Fri Dec 13 16:19:46 2013
New Revision: 1550761

URL: http://svn.apache.org/r1550761
Log:
fix bad post-merge artifacts

Modified:
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/ctfonts.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx

Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/ctfonts.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/ctfonts.cxx?rev=1550761&r1=1550760&r2=1550761&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/ctfonts.cxx 
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/ctfonts.cxx Fri 
Dec 13 16:19:46 2013
@@ -313,7 +313,7 @@ ImplFontEntry* CTFontData::CreateFontIns
 
 int CTFontData::GetFontTable( const char pTagName[5], unsigned char* 
pResultBuf ) const
 {
-       DBG_ASSERT( aTagName[4]=='\0', "CTFontData::GetFontTable with invalid 
tagname!\n" );
+       DBG_ASSERT( pTagName[4]=='\0', "CTFontData::GetFontTable with invalid 
tagname!\n" );
 
        const CTFontTableTag nTagCode = (pTagName[0]<<24) + (pTagName[1]<<16) + 
(pTagName[2]<<8) + (pTagName[3]<<0);
 

Modified: 
openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1550761&r1=1550760&r2=1550761&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx 
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx 
Fri Dec 13 16:19:46 2013
@@ -175,7 +175,7 @@ void AquaSalGraphics::SetState()
 
 bool AquaSalGraphics::CheckContext()
 {
-    if( mbWindow && mpFrame && mpFrame->getWindow() )
+    if( mbWindow && mpFrame && mpFrame->getNSWindow() )
     {
         const unsigned int nWidth = mpFrame->maGeometry.nWidth;
         const unsigned int nHeight = mpFrame->maGeometry.nHeight;

Modified: 
openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx?rev=1550761&r1=1550760&r2=1550761&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx 
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx 
Fri Dec 13 16:19:46 2013
@@ -207,7 +207,7 @@ void AquaSalFrame::initWindowAndView()
     else
         [mpNSWindow setAcceptsMouseMovedEvents: YES];
     [mpNSWindow setHasShadow: YES];
-    [mpNSWindow setDelegate: mpNSWindow];
+    [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)];
 
     const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth, 
maGeometry.nHeight );
     mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView 
userData: nil assumeInside: NO];