summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-01 19:08:19 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-02 14:46:42 +0100
commit11d20507806d30e2d1955b93a568b84a2216ef69 (patch)
treeb34fa3afac27eac9404f16e46b530aa2cbcad41d /vcl/aqua
parent7b981b7cab15e0fc2ebb159df2d40c3a2499b265 (diff)
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/app/saldata.cxx4
-rw-r--r--vcl/aqua/source/app/salinst.cxx4
-rw-r--r--vcl/aqua/source/gdi/salbmp.cxx4
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx10
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx4
-rw-r--r--vcl/aqua/source/window/salframe.cxx2
-rw-r--r--vcl/aqua/source/window/salmenu.cxx6
7 files changed, 17 insertions, 17 deletions
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 28d3fc0df71b..925dfa8c00b0 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -111,7 +111,7 @@ void SalData::ensureThreadAutoreleasePool()
}
else
{
- DBG_ERROR( "no autorelease key" );
+ OSL_FAIL( "no autorelease key" );
}
}
@@ -135,7 +135,7 @@ void SalData::drainThreadAutoreleasePool()
}
else
{
- DBG_ERROR( "no autorelease key" );
+ OSL_FAIL( "no autorelease key" );
}
}
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 570ba4ff3747..da5b92b7ff7f 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -246,7 +246,7 @@ BOOL ImplSVMainHook( int * pnInit )
}
else
{
- DBG_ERROR( "NSApplication initialization could not be done" );
+ OSL_FAIL( "NSApplication initialization could not be done" );
}
return TRUE; // indicate that ImplSVMainHook is implemented
@@ -667,7 +667,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
break;
default:
- DBG_ERROR( "unhandled NSApplicationDefined event" );
+ OSL_FAIL( "unhandled NSApplicationDefined event" );
break;
};
}
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 3a37f6d32d39..2a531f243de2 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -265,7 +265,7 @@ bool AquaSalBitmap::AllocateUserData()
case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break;
case 32: mnBytesPerRow = mnWidth << 2; break;
default:
- DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!");
+ OSL_FAIL("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!");
}
}
@@ -276,7 +276,7 @@ bool AquaSalBitmap::AllocateUserData()
}
catch( const std::bad_alloc& )
{
- DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
+ OSL_FAIL( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
maUserBuffer.reset( NULL );
mnBytesPerRow = 0;
}
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 7b8e41584a30..cd32820f258c 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -443,17 +443,17 @@ void AquaSalGraphics::initResolution( NSWindow* pWin )
}
else
{
- DBG_ERROR( "no resolution found in device description" );
+ OSL_FAIL( "no resolution found in device description" );
}
}
else
{
- DBG_ERROR( "no device description" );
+ OSL_FAIL( "no device description" );
}
}
else
{
- DBG_ERROR( "no screen found" );
+ OSL_FAIL( "no screen found" );
}
// #i107076# maintaining size-WYSIWYG-ness causes many problems for
@@ -1269,7 +1269,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor )
{
- DBG_ERROR("not implemented for color masking!");
+ OSL_FAIL("not implemented for color masking!");
drawBitmap( pPosAry, rSalBitmap );
}
@@ -2416,7 +2416,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
else if( pFontData->IsEmbeddable() )
{
// get individual character widths
- DBG_ERROR("not implemented for non-subsettable fonts!\n");
+ OSL_FAIL("not implemented for non-subsettable fonts!\n");
}
}
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index de7cbcbf4d5e..3d6eba93a59b 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -152,7 +152,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 );
}
else
- DBG_ERROR( "no print info in SetupPrinterGraphics" );
+ OSL_FAIL( "no print info in SetupPrinterGraphics" );
}
}
@@ -775,7 +775,7 @@ BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName,
bool i_bDirect,
ImplJobSetup* i_pSetupData )
{
- DBG_ERROR( "should never be called" );
+ OSL_FAIL( "should never be called" );
return FALSE;
}
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index e280a583b3d5..ca99a2ca6a2d 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -848,7 +848,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
pCursor = GetSalData()->getCursor( mePointerStyle );
if( pCursor == nil )
{
- DBG_ERROR( "unmapped cursor" );
+ OSL_FAIL( "unmapped cursor" );
pCursor = [NSCursor arrowCursor];
}
break;
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index df1de50d8709..a124201480b5 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -554,7 +554,7 @@ void AquaSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
maItems.insert( maItems.begin() + nPos, pAquaSalMenuItem );
else
{
- DBG_ERROR( "invalid item index in insert" );
+ OSL_FAIL( "invalid item index in insert" );
return;
}
@@ -577,7 +577,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos )
}
else
{
- DBG_ERROR( "invalid item index in remove" );
+ OSL_FAIL( "invalid item index in remove" );
return;
}
@@ -800,7 +800,7 @@ void AquaSalMenu::statusLayout()
if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
[(OOStatusItemView*)pView layout];
else
- DBG_ERROR( "someone stole our status view" );
+ OSL_FAIL( "someone stole our status view" );
}
}