mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VCL : Remove usage of DBG_CTOR and DBG_DTOR.

Browse Source 
Valgrind is capable of detecting such bugs. No need for extra macros.

Change-Id: I6a785b42be72736560ec69f1a7949f2f0b9414a3
Reviewed-on: https://gerrit.libreoffice.org/6805
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Arnaud Versini 2013-11-24 19:54:30 +01:00 committed by Caolán McNamara
parent 35c1d6f761
commit c0125d64cb
26 changed files with 4 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
vcl/source/app/dbggui.cxx
View File

@ -68,46 +68,6 @@ static const sal_Char* pDbgHelpText[] =
"------------------------------------------\n",
"\n",
"--- Macros ---\n",
"DBG_NAME( aName )\n",
"Defines the administration data for a class. This macro may only be used "
" in a source file with the same name.\n",
"\n",
"DBG_NAMEEX( aName )\n",
"Like DBG_NAME, only for other source files.\n",
"\n",
"DBG_CTOR( aName, fTest )\n",
"Must be used in all constructors of a class (also in the CopyCtor). "
"The first parameter must be the registered name (best would be the "
"class name) and the second parameter the test function or 0.\n",
"\n",
"DBG_DTOR( aName, fTest )\n",
"Must be used in the destructor of the class. The first parameter is "
"the registered name and the second parameter is the test function or "
"0.\n",
"\n",
"DBG_CHKTHIS( aName, fTest )\n",
"Can be used in methods of the class when constructors and the "
"desctructor of the class are equiped with the corresponding macros. "
"The first parameter is the registered name, the second parameter is "
"the test function or 0.\n",
"\n",
"DBG_CHKOBJ( pObj, aName, fTest )\n",
"Can be used on instances of a class where the constructors and the "
"destructor of the class are equiped with the corresponding macros. "
"The first parameter is the registered name, the second parameter is "
"the test function or 0.\n",
"\n",
"To make the macros work DBG_UTIL must be defined.\n",
"\n",
"--- Options ---\n",
"This\n",
"The This pointer is validated. This way all objects that are equiped "
"with it can be tested to make sure one is working with existing objects. "
"This way it's easier to find bugs in case of multiple inheritence, "
"alignment or compiler errors. Since almost all standard classes of SV "
"(String, List, Pen, Brush, Polygon, ...) are equiped with DBG_CHKTHIS() "
"a lot of errors are found, although this test will impact performance "
"accordingly.\n",
"\n",
"Function\n",
"When a function is passed with macros, it will be called.\n",
@ -115,18 +75,6 @@ static const sal_Char* pDbgHelpText[] =
"Exit\n",
"This- and Func-Test will also run when exiting the function.\n",
"\n",
"Report\n",
"At the end of the program the number of generated objects is produced "
"as output. Because all important SV classes have at least DBG_CTOR() / "
"DBG_DTOR() it can checked so called resource leaks (system objects which "
" are not freed) exist. These include OutputDevice, Window, VirtualDevice, "
" Printer and Menu. Note: Dtor calls of static objects are not taken into "
" account. Therefor each SV program leaves 2 strings and a bitmap behind.\n",
"\n",
"Trace\n",
"Creation, destruction and usage of objects which are equiped with "
"DBG_XTOR is logged.\n",
"\n",
"\n",
"\nOther tests and macros\n",
"------------------------------------------\n",
@ -137,7 +85,6 @@ static const sal_Char* pDbgHelpText[] =
"and the time this took (including calls to children) in milliseconds is "
"output. These macros can be used to check the same function runs over the "
"entire development period, for example the startup speed. The registered name "
"which was registered with DBG_NAME() must be passed to the macros.\n",
"\n",
"Resources\n",
"In case of resource errors an error dialog is produced before the "
@ -293,7 +240,6 @@ static const sal_Char* pDbgHelpText[] =
"Example\n",
"------------------------------------------\n",
"\n",
"DBG_NAME( String );\n",
"\n",
"#ifdef DBG_UTIL\n",
"const sal_Char* DbgCheckString( const void* pString )\n",
@ -309,31 +255,21 @@ static const sal_Char* pDbgHelpText[] =
"\n",
"String::String()\n",
"{\n",
" DBG_CTOR( String, DbgCheckString );\n",
" // ...\n",
"}\n",
"\n",
"String::~String()\n",
"{\n",
" DBG_DTOR( String, DbgCheckString );\n",
" //...\n",
"}\n",
"\n",
"char& String::operator [] ( sal_uInt16 nIndex )\n",
"{\n",
" DBG_CHKTHIS( String, DbgCheckString );\n",
" DBG_ASSERT( nIndex <= pData->nLen, \"String::[] : nIndex > Len\" );\n",
"\n",
" //...\n",
"}\n",
"\n",
"sal_uInt16 String::Search( const String& rStr, sal_uInt16 nIndex ) const\n",
"{\n",
" DBG_CHKTHIS( String, DbgCheckString );\n",
" DBG_CHKOBJ( &rStr, String, DbgCheckString );\n",
"\n",
" //...\n",
"}",
"\n",
NULL
};

13
vcl/source/app/settings.cxx
View File

@ -50,7 +50,6 @@ using namespace ::com::sun::star;
#include "impimagetree.hxx"
// =======================================================================
DBG_NAME( AllSettings )
// =======================================================================
@ -1393,7 +1392,6 @@ ImplAllSettingsData::~ImplAllSettingsData()
AllSettings::AllSettings()
{
DBG_CTOR( AllSettings, NULL );
mpData = new ImplAllSettingsData();
}
@ -1402,7 +1400,6 @@ AllSettings::AllSettings()
AllSettings::AllSettings( const AllSettings& rSet )
{
DBG_CTOR( AllSettings, NULL );
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "Settings: RefCount overflow" );
// copy shared instance data and increse reference counter
@ -1414,7 +1411,6 @@ AllSettings::AllSettings( const AllSettings& rSet )
AllSettings::~AllSettings()
{
DBG_DTOR( AllSettings, NULL );
// if last reference then delete data
if ( mpData->mnRefCount == 1 )
@ -1428,8 +1424,6 @@ AllSettings::~AllSettings()
const AllSettings& AllSettings::operator =( const AllSettings& rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "AllSettings: RefCount overflow" );
DBG_CHKTHIS( AllSettings, NULL );
DBG_CHKOBJ( &rSet, AllSettings, NULL );
// increase reference counter first, to be able to assign oneself
rSet.mpData->mnRefCount++;
@ -1449,7 +1443,6 @@ const AllSettings& AllSettings::operator =( const AllSettings& rSet )
void AllSettings::CopyData()
{
DBG_CHKTHIS( AllSettings, NULL );
// copy if other references exist
if ( mpData->mnRefCount != 1 )
@ -1463,8 +1456,6 @@ void AllSettings::CopyData()
sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
{
DBG_CHKTHIS( AllSettings, NULL );
DBG_CHKOBJ( &rSet, AllSettings, NULL );
sal_uLong nChangeFlags = 0;
@ -1529,8 +1520,6 @@ sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const
{
DBG_CHKTHIS( AllSettings, NULL );
DBG_CHKOBJ( &rSet, AllSettings, NULL );
sal_uLong nChangeFlags = 0;
@ -1556,8 +1545,6 @@ sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const
sal_Bool AllSettings::operator ==( const AllSettings& rSet ) const
{
DBG_CHKTHIS( AllSettings, NULL );
DBG_CHKOBJ( &rSet, AllSettings, NULL );
if ( mpData == rSet.mpData )
return sal_True;

4
vcl/source/gdi/animate.cxx
View File

@ -27,7 +27,6 @@
#include <impanmvw.hxx>
#include <vcl/dibtools.hxx>
DBG_NAME( Animation )
#define MIN_TIMEOUT 2L
#define INC_TIMEOUT 0L
@ -72,7 +71,6 @@ Animation::Animation() :
mbLoopTerminated ( sal_False ),
mbIsWaiting ( sal_False )
{
DBG_CTOR( Animation, NULL );
maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) );
}
@ -86,7 +84,6 @@ Animation::Animation( const Animation& rAnimation ) :
mbLoopTerminated ( rAnimation.mbLoopTerminated ),
mbIsWaiting ( rAnimation.mbIsWaiting )
{
DBG_CTOR( Animation, NULL );
for( size_t i = 0, nCount = rAnimation.maList.size(); i < nCount; i++ )
maList.push_back( new AnimationBitmap( *rAnimation.maList[ i ] ) );
@ -97,7 +94,6 @@ Animation::Animation( const Animation& rAnimation ) :
Animation::~Animation()
{
DBG_DTOR( Animation, NULL );
if( mbIsInAnimation )
Stop();

40
vcl/source/gdi/font.cxx
View File

@ -37,7 +37,6 @@
using namespace vcl;
DBG_NAME( Font )
Impl_Font::Impl_Font() :
maColor( COL_TRANSPARENT ),
@ -228,7 +227,6 @@ void Font::MakeUnique()
Font::Font()
{
DBG_CTOR( Font, NULL );
static Impl_Font aStaticImplFont;
// RefCount is zero for static objects
@ -238,8 +236,6 @@ Font::Font()
Font::Font( const Font& rFont )
{
DBG_CTOR( Font, NULL );
DBG_CHKOBJ( &rFont, Font, NULL );
bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max();
DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
@ -251,7 +247,6 @@ Font::Font( const Font& rFont )
Font::Font( const OUString& rFamilyName, const Size& rSize )
{
DBG_CTOR( Font, NULL );
mpImplFont = new Impl_Font;
mpImplFont->maFamilyName = rFamilyName;
@ -260,7 +255,6 @@ Font::Font( const OUString& rFamilyName, const Size& rSize )
Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const Size& rSize )
{
DBG_CTOR( Font, NULL );
mpImplFont = new Impl_Font;
mpImplFont->maFamilyName= rFamilyName;
@ -270,7 +264,6 @@ Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const Size&
Font::Font( FontFamily eFamily, const Size& rSize )
{
DBG_CTOR( Font, NULL );
mpImplFont = new Impl_Font;
mpImplFont->meFamily = eFamily;
@ -279,7 +272,6 @@ Font::Font( FontFamily eFamily, const Size& rSize )
Font::~Font()
{
DBG_DTOR( Font, NULL );
// decrement reference counter and delete if last reference
// if the object is not static (Refcounter==0)
@ -294,7 +286,6 @@ Font::~Font()
void Font::SetColor( const Color& rColor )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maColor != rColor )
{
@ -305,7 +296,6 @@ void Font::SetColor( const Color& rColor )
void Font::SetFillColor( const Color& rColor )
{
DBG_CHKTHIS( Font, NULL );
MakeUnique();
mpImplFont->maFillColor = rColor;
@ -315,7 +305,6 @@ void Font::SetFillColor( const Color& rColor )
void Font::SetTransparent( sal_Bool bTransparent )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mbTransparent != bTransparent )
{
@ -326,7 +315,6 @@ void Font::SetTransparent( sal_Bool bTransparent )
void Font::SetAlign( FontAlign eAlign )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meAlign != eAlign )
{
@ -337,7 +325,6 @@ void Font::SetAlign( FontAlign eAlign )
void Font::SetName( const OUString& rFamilyName )
{
DBG_CHKTHIS( Font, NULL );
MakeUnique();
mpImplFont->maFamilyName = rFamilyName;
@ -345,7 +332,6 @@ void Font::SetName( const OUString& rFamilyName )
void Font::SetStyleName( const OUString& rStyleName )
{
DBG_CHKTHIS( Font, NULL );
MakeUnique();
mpImplFont->maStyleName = rStyleName;
@ -353,7 +339,6 @@ void Font::SetStyleName( const OUString& rStyleName )
void Font::SetSize( const Size& rSize )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maSize != rSize )
{
@ -364,7 +349,6 @@ void Font::SetSize( const Size& rSize )
void Font::SetFamily( FontFamily eFamily )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meFamily != eFamily )
{
@ -375,7 +359,6 @@ void Font::SetFamily( FontFamily eFamily )
void Font::SetCharSet( rtl_TextEncoding eCharSet )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meCharSet != eCharSet )
{
@ -386,7 +369,6 @@ void Font::SetCharSet( rtl_TextEncoding eCharSet )
void Font::SetLanguageTag( const LanguageTag& rLanguageTag )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maLanguageTag != rLanguageTag )
{
@ -397,7 +379,6 @@ void Font::SetLanguageTag( const LanguageTag& rLanguageTag )
void Font::SetCJKContextLanguageTag( const LanguageTag& rLanguageTag )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maCJKLanguageTag != rLanguageTag )
{
@ -408,7 +389,6 @@ void Font::SetCJKContextLanguageTag( const LanguageTag& rLanguageTag )
void Font::SetLanguage( LanguageType eLanguage )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maLanguageTag.getLanguageType( false) != eLanguage )
{
@ -419,7 +399,6 @@ void Font::SetLanguage( LanguageType eLanguage )
void Font::SetCJKContextLanguage( LanguageType eLanguage )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->maCJKLanguageTag.getLanguageType( false) != eLanguage )
{
@ -430,7 +409,6 @@ void Font::SetCJKContextLanguage( LanguageType eLanguage )
void Font::SetPitch( FontPitch ePitch )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mePitch != ePitch )
{
@ -441,7 +419,6 @@ void Font::SetPitch( FontPitch ePitch )
void Font::SetOrientation( short nOrientation )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mnOrientation != nOrientation )
{
@ -452,7 +429,6 @@ void Font::SetOrientation( short nOrientation )
void Font::SetVertical( sal_Bool bVertical )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mbVertical != bVertical )
{
@ -463,7 +439,6 @@ void Font::SetVertical( sal_Bool bVertical )
void Font::SetKerning( FontKerning nKerning )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mnKerning != nKerning )
{
@ -479,7 +454,6 @@ sal_Bool Font::IsKerning() const
void Font::SetWeight( FontWeight eWeight )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meWeight != eWeight )
{
@ -490,7 +464,6 @@ void Font::SetWeight( FontWeight eWeight )
void Font::SetWidthType( FontWidth eWidth )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meWidthType != eWidth )
{
@ -501,7 +474,6 @@ void Font::SetWidthType( FontWidth eWidth )
void Font::SetItalic( FontItalic eItalic )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meItalic != eItalic )
{
@ -512,7 +484,6 @@ void Font::SetItalic( FontItalic eItalic )
void Font::SetOutline( sal_Bool bOutline )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mbOutline != bOutline )
{
@ -523,7 +494,6 @@ void Font::SetOutline( sal_Bool bOutline )
void Font::SetShadow( sal_Bool bShadow )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mbShadow != bShadow )
{
@ -534,7 +504,6 @@ void Font::SetShadow( sal_Bool bShadow )
void Font::SetUnderline( FontUnderline eUnderline )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meUnderline != eUnderline )
{
@ -545,7 +514,6 @@ void Font::SetUnderline( FontUnderline eUnderline )
void Font::SetOverline( FontUnderline eOverline )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meOverline != eOverline )
{
@ -556,7 +524,6 @@ void Font::SetOverline( FontUnderline eOverline )
void Font::SetStrikeout( FontStrikeout eStrikeout )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meStrikeout != eStrikeout )
{
@ -567,7 +534,6 @@ void Font::SetStrikeout( FontStrikeout eStrikeout )
void Font::SetRelief( FontRelief eRelief )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meRelief != eRelief )
{
@ -578,7 +544,6 @@ void Font::SetRelief( FontRelief eRelief )
void Font::SetEmphasisMark( FontEmphasisMark eEmphasisMark )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->meEmphasisMark != eEmphasisMark )
{
@ -589,7 +554,6 @@ void Font::SetEmphasisMark( FontEmphasisMark eEmphasisMark )
void Font::SetWordLineMode( sal_Bool bWordLine )
{
DBG_CHKTHIS( Font, NULL );
if( mpImplFont->mbWordLine != bWordLine )
{
@ -600,8 +564,6 @@ void Font::SetWordLineMode( sal_Bool bWordLine )
Font& Font::operator=( const Font& rFont )
{
DBG_CHKTHIS( Font, NULL );
DBG_CHKOBJ( &rFont, Font, NULL );
bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max();
DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
@ -627,8 +589,6 @@ Font& Font::operator=( const Font& rFont )
sal_Bool Font::operator==( const Font& rFont ) const
{
DBG_CHKTHIS( Font, NULL );
DBG_CHKOBJ( &rFont, Font, NULL );
if( mpImplFont == rFont.mpImplFont )
return sal_True;

20
vcl/source/gdi/gradient.cxx
View File

@ -23,7 +23,6 @@
#include <tools/gen.hxx>
#include <vcl/gradient.hxx>
DBG_NAME( Gradient )
Impl_Gradient::Impl_Gradient() :
maStartColor( COL_BLACK ),
@ -69,15 +68,12 @@ void Gradient::MakeUnique()
Gradient::Gradient()
{
DBG_CTOR( Gradient, NULL );
mpImplGradient = new Impl_Gradient;
}
Gradient::Gradient( const Gradient& rGradient )
{
DBG_CTOR( Gradient, NULL );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
// Take over instance data and increment refcount
mpImplGradient = rGradient.mpImplGradient;
@ -87,7 +83,6 @@ Gradient::Gradient( const Gradient& rGradient )
Gradient::Gradient( GradientStyle eStyle,
const Color& rStartColor, const Color& rEndColor )
{
DBG_CTOR( Gradient, NULL );
mpImplGradient = new Impl_Gradient;
mpImplGradient->meStyle = eStyle;
@ -97,7 +92,6 @@ Gradient::Gradient( GradientStyle eStyle,
Gradient::~Gradient()
{
DBG_DTOR( Gradient, NULL );
// If it's the last reference, delete it, otherwise
// decrement refcount
@ -109,7 +103,6 @@ Gradient::~Gradient()
void Gradient::SetStyle( GradientStyle eStyle )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->meStyle = eStyle;
@ -117,7 +110,6 @@ void Gradient::SetStyle( GradientStyle eStyle )
void Gradient::SetStartColor( const Color& rColor )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->maStartColor = rColor;
@ -125,7 +117,6 @@ void Gradient::SetStartColor( const Color& rColor )
void Gradient::SetEndColor( const Color& rColor )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->maEndColor = rColor;
@ -133,7 +124,6 @@ void Gradient::SetEndColor( const Color& rColor )
void Gradient::SetAngle( sal_uInt16 nAngle )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnAngle = nAngle;
@ -141,7 +131,6 @@ void Gradient::SetAngle( sal_uInt16 nAngle )
void Gradient::SetBorder( sal_uInt16 nBorder )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnBorder = nBorder;
@ -149,7 +138,6 @@ void Gradient::SetBorder( sal_uInt16 nBorder )
void Gradient::SetOfsX( sal_uInt16 nOfsX )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnOfsX = nOfsX;
@ -157,7 +145,6 @@ void Gradient::SetOfsX( sal_uInt16 nOfsX )
void Gradient::SetOfsY( sal_uInt16 nOfsY )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnOfsY = nOfsY;
@ -165,7 +152,6 @@ void Gradient::SetOfsY( sal_uInt16 nOfsY )
void Gradient::SetStartIntensity( sal_uInt16 nIntens )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnIntensityStart = nIntens;
@ -173,7 +159,6 @@ void Gradient::SetStartIntensity( sal_uInt16 nIntens )
void Gradient::SetEndIntensity( sal_uInt16 nIntens )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnIntensityEnd = nIntens;
@ -181,7 +166,6 @@ void Gradient::SetEndIntensity( sal_uInt16 nIntens )
void Gradient::SetSteps( sal_uInt16 nSteps )
{
DBG_CHKTHIS( Gradient, NULL );
MakeUnique();
mpImplGradient->mnStepCount = nSteps;
@ -267,8 +251,6 @@ void Gradient::GetBoundRect( const Rectangle& rRect, Rectangle& rBoundRect, Poin
Gradient& Gradient::operator=( const Gradient& rGradient )
{
DBG_CHKTHIS( Gradient, NULL );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
// Increment refcount first so that we can reference ourselves
rGradient.mpImplGradient->mnRefCount++;
@ -285,8 +267,6 @@ Gradient& Gradient::operator=( const Gradient& rGradient )
sal_Bool Gradient::operator==( const Gradient& rGradient ) const
{
DBG_CHKTHIS( Gradient, NULL );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
if ( mpImplGradient == rGradient.mpImplGradient )
return sal_True;

13
vcl/source/gdi/hatch.cxx
View File

@ -22,7 +22,6 @@
#include <tools/debug.hxx>
#include <vcl/hatch.hxx>
DBG_NAME( Hatch )
ImplHatch::ImplHatch() :
mnRefCount ( 1 ),
@ -44,14 +43,11 @@ ImplHatch::ImplHatch( const ImplHatch& rImplHatch ) :
Hatch::Hatch()
{
DBG_CTOR( Hatch, NULL );
mpImplHatch = new ImplHatch;
}
Hatch::Hatch( const Hatch& rHatch )
{
DBG_CTOR( Hatch, NULL );
DBG_CHKOBJ( &rHatch, Hatch, NULL );
mpImplHatch = rHatch.mpImplHatch;
mpImplHatch->mnRefCount++;
}
@ -59,7 +55,6 @@ Hatch::Hatch( const Hatch& rHatch )
Hatch::Hatch( HatchStyle eStyle, const Color& rColor,
long nDistance, sal_uInt16 nAngle10 )
{
DBG_CTOR( Hatch, NULL );
mpImplHatch = new ImplHatch;
mpImplHatch->maColor = rColor;
mpImplHatch->meStyle = eStyle;
@ -69,15 +64,12 @@ Hatch::Hatch( HatchStyle eStyle, const Color& rColor,
Hatch::~Hatch()
{
DBG_DTOR( Hatch, NULL );
if( !( --mpImplHatch->mnRefCount ) )
delete mpImplHatch;
}
Hatch& Hatch::operator=( const Hatch& rHatch )
{
DBG_CHKTHIS( Hatch, NULL );
DBG_CHKOBJ( &rHatch, Hatch, NULL );
rHatch.mpImplHatch->mnRefCount++;
@ -90,8 +82,6 @@ Hatch& Hatch::operator=( const Hatch& rHatch )
sal_Bool Hatch::operator==( const Hatch& rHatch ) const
{
DBG_CHKTHIS( Hatch, NULL );
DBG_CHKOBJ( &rHatch, Hatch, NULL );
return( mpImplHatch == rHatch.mpImplHatch ||
( mpImplHatch->maColor == rHatch.mpImplHatch->maColor &&
@ -113,21 +103,18 @@ void Hatch::ImplMakeUnique()
void Hatch::SetColor( const Color& rColor )
{
DBG_CHKTHIS( Hatch, NULL );
ImplMakeUnique();
mpImplHatch->maColor = rColor;
}
void Hatch::SetDistance( long nDistance )
{
DBG_CHKTHIS( Hatch, NULL );
ImplMakeUnique();
mpImplHatch->mnDistance = nDistance;
}
void Hatch::SetAngle( sal_uInt16 nAngle10 )
{
DBG_CHKTHIS( Hatch, NULL );
ImplMakeUnique();
mpImplHatch->mnAngle = nAngle10;
}

37
vcl/source/gdi/image.cxx
View File

@ -41,21 +41,17 @@
#include <rtl/strbuf.hxx>
#endif
DBG_NAME( Image )
DBG_NAME( ImageList )
using namespace ::com::sun::star;
Image::Image() :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
}
Image::Image( const ResId& rResId ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
rResId.SetRT( RSC_IMAGE );
@ -102,7 +98,6 @@ Image::Image( const ResId& rResId ) :
Image::Image( const Image& rImage ) :
mpImplData( rImage.mpImplData )
{
DBG_CTOR( Image, NULL );
if( mpImplData )
++mpImplData->mnRefCount;
@ -111,7 +106,6 @@ Image::Image( const Image& rImage ) :
Image::Image( const BitmapEx& rBitmapEx ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
ImplInit( rBitmapEx );
}
@ -119,7 +113,6 @@ Image::Image( const BitmapEx& rBitmapEx ) :
Image::Image( const Bitmap& rBitmap ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
ImplInit( rBitmap );
}
@ -127,7 +120,6 @@ Image::Image( const Bitmap& rBitmap ) :
Image::Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
const BitmapEx aBmpEx( rBitmap, rMaskBitmap );
@ -137,7 +129,6 @@ Image::Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap ) :
Image::Image( const Bitmap& rBitmap, const Color& rColor ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
const BitmapEx aBmpEx( rBitmap, rColor );
@ -147,7 +138,6 @@ Image::Image( const Bitmap& rBitmap, const Color& rColor ) :
Image::Image( const uno::Reference< graphic::XGraphic >& rxGraphic ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
const Graphic aGraphic( rxGraphic );
ImplInit( aGraphic.GetBitmapEx() );
@ -156,7 +146,6 @@ Image::Image( const uno::Reference< graphic::XGraphic >& rxGraphic ) :
Image::Image( const OUString &rFileUrl ) :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
OUString aTmp;
osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
Graphic aGraphic;
@ -169,7 +158,6 @@ Image::Image( const OUString &rFileUrl ) :
Image::~Image()
{
DBG_DTOR( Image, NULL );
if( mpImplData && ( 0 == --mpImplData->mnRefCount ) )
delete mpImplData;
@ -197,7 +185,6 @@ void Image::ImplInit( const BitmapEx& rBmpEx )
Size Image::GetSizePixel() const
{
DBG_CHKTHIS( Image, NULL );
Size aRet;
@ -220,7 +207,6 @@ Size Image::GetSizePixel() const
BitmapEx Image::GetBitmapEx() const
{
DBG_CHKTHIS( Image, NULL );
BitmapEx aRet;
@ -250,8 +236,6 @@ uno::Reference< graphic::XGraphic > Image::GetXGraphic() const
Image& Image::operator=( const Image& rImage )
{
DBG_CHKTHIS( Image, NULL );
DBG_CHKOBJ( &rImage, Image, NULL );
if( rImage.mpImplData )
++rImage.mpImplData->mnRefCount;
@ -266,8 +250,6 @@ Image& Image::operator=( const Image& rImage )
sal_Bool Image::operator==( const Image& rImage ) const
{
DBG_CHKTHIS( Image, NULL );
DBG_CHKOBJ( &rImage, Image, NULL );
bool bRet = false;
@ -303,7 +285,6 @@ ImageList::ImageList( sal_uInt16 nInit, sal_uInt16 nGrow ) :
mnInitSize( nInit ),
mnGrowSize( nGrow )
{
DBG_CTOR( ImageList, NULL );
}
ImageList::ImageList( const ResId& rResId ) :
@ -313,7 +294,6 @@ ImageList::ImageList( const ResId& rResId ) :
{
SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" );
DBG_CTOR( ImageList, NULL );
rResId.SetRT( RSC_IMAGELIST );
@ -363,7 +343,6 @@ ImageList::ImageList( const ::std::vector< OUString >& rNameVector,
{
SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." );
DBG_CTOR( ImageList, NULL );
ImplInit( sal::static_int_cast< sal_uInt16 >( rNameVector.size() ), Size() );
@ -379,7 +358,6 @@ ImageList::ImageList( const ImageList& rImageList ) :
mnInitSize( rImageList.mnInitSize ),
mnGrowSize( rImageList.mnGrowSize )
{
DBG_CTOR( ImageList, NULL );
if( mpImplData )
++mpImplData->mnRefCount;
@ -387,7 +365,6 @@ ImageList::ImageList( const ImageList& rImageList ) :
ImageList::~ImageList()
{
DBG_DTOR( ImageList, NULL );
if( mpImplData && ( 0 == --mpImplData->mnRefCount ) )
delete mpImplData;
@ -511,7 +488,6 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
ImageAryData *pImg = mpImplData->maNameHash[ rImageName ];
if( pImg )
@ -547,7 +523,6 @@ void ImageList::ReplaceImage( const OUString& rImageName, const Image& rImage )
void ImageList::RemoveImage( sal_uInt16 nId )
{
DBG_CHKTHIS( ImageList, NULL );
for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); ++i )
{
@ -561,7 +536,6 @@ void ImageList::RemoveImage( sal_uInt16 nId )
Image ImageList::GetImage( sal_uInt16 nId ) const
{
DBG_CHKTHIS( ImageList, NULL );
Image aRet;
@ -611,14 +585,12 @@ Image ImageList::GetImage( const OUString& rImageName ) const
sal_uInt16 ImageList::GetImageCount() const
{
DBG_CHKTHIS( ImageList, NULL );
return mpImplData ? static_cast< sal_uInt16 >( mpImplData->maImages.size() ) : 0;
}
sal_uInt16 ImageList::GetImagePos( sal_uInt16 nId ) const
{
DBG_CHKTHIS( ImageList, NULL );
if( mpImplData && nId )
{
@ -639,7 +611,6 @@ bool ImageList::HasImageAtPos( sal_uInt16 nId ) const
sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
if( mpImplData && !rImageName.isEmpty() )
{
@ -655,7 +626,6 @@ sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const
sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
if( mpImplData && (nPos < GetImageCount()) )
return mpImplData->maImages[ nPos ]->mnId;
@ -665,7 +635,6 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const
OUString ImageList::GetImageName( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
if( mpImplData && (nPos < GetImageCount()) )
return mpImplData->maImages[ nPos ]->maName;
@ -677,7 +646,6 @@ void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
{
SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" );
DBG_CHKTHIS( ImageList, NULL );
rNames = ::std::vector< OUString >();
@ -694,7 +662,6 @@ void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
Size ImageList::GetImageSize() const
{
DBG_CHKTHIS( ImageList, NULL );
Size aRet;
@ -715,8 +682,6 @@ Size ImageList::GetImageSize() const
ImageList& ImageList::operator=( const ImageList& rImageList )
{
DBG_CHKTHIS( ImageList, NULL );
DBG_CHKOBJ( &rImageList, ImageList, NULL );
if( rImageList.mpImplData )
++rImageList.mpImplData->mnRefCount;
@ -731,8 +696,6 @@ ImageList& ImageList::operator=( const ImageList& rImageList )
sal_Bool ImageList::operator==( const ImageList& rImageList ) const
{
DBG_CHKTHIS( ImageList, NULL );
DBG_CHKOBJ( &rImageList, ImageList, NULL );
bool bRet = false;

9
vcl/source/gdi/jobset.cxx
View File

@ -25,7 +25,6 @@
#include <jobset.h>
DBG_NAME( JobSetup )
#define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF)
#define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE)
@ -121,15 +120,12 @@ const ImplJobSetup* JobSetup::ImplGetConstData() const
JobSetup::JobSetup()
{
DBG_CTOR( JobSetup, NULL );
mpData = NULL;
}
JobSetup::JobSetup( const JobSetup& rJobSetup )
{
DBG_CTOR( JobSetup, NULL );
DBG_CHKOBJ( &rJobSetup, JobSetup, NULL );
DBG_ASSERT( !rJobSetup.mpData || (rJobSetup.mpData->mnRefCount < 0xFFFE), "JobSetup: RefCount overflow" );
mpData = rJobSetup.mpData;
@ -139,7 +135,6 @@ JobSetup::JobSetup( const JobSetup& rJobSetup )
JobSetup::~JobSetup()
{
DBG_DTOR( JobSetup, NULL );
if ( mpData )
{
@ -176,8 +171,6 @@ void JobSetup::SetValue( const OUString& rKey, const OUString& rValue )
JobSetup& JobSetup::operator=( const JobSetup& rJobSetup )
{
DBG_CHKTHIS( JobSetup, NULL );
DBG_CHKOBJ( &rJobSetup, JobSetup, NULL );
DBG_ASSERT( !rJobSetup.mpData || (rJobSetup.mpData->mnRefCount) < 0xFFFE, "JobSetup: RefCount overflow" );
// Increment refcount first, so that we can assign to ourselves
@ -201,8 +194,6 @@ JobSetup& JobSetup::operator=( const JobSetup& rJobSetup )
sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const
{
DBG_CHKTHIS( JobSetup, NULL );
DBG_CHKOBJ( &rJobSetup, JobSetup, NULL );
if ( mpData == rJobSetup.mpData )
return sal_True;

18
vcl/source/gdi/lineinfo.cxx
View File

@ -26,7 +26,6 @@
#include <basegfx/polygon/b2dlinegeometry.hxx>
#include <numeric>
DBG_NAME( LineInfo )
// ----------------
// - ImplLineInfo -
@ -83,7 +82,6 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const
LineInfo::LineInfo( LineStyle eStyle, long nWidth )
{
DBG_CTOR( LineInfo, NULL );
mpImplLineInfo = new ImplLineInfo;
mpImplLineInfo->meStyle = eStyle;
mpImplLineInfo->mnWidth = nWidth;
@ -93,8 +91,6 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth )
LineInfo::LineInfo( const LineInfo& rLineInfo )
{
DBG_CTOR( LineInfo, NULL );
DBG_CHKOBJ( &rLineInfo, LineInfo, NULL );
mpImplLineInfo = rLineInfo.mpImplLineInfo;
mpImplLineInfo->mnRefCount++;
}
@ -103,7 +99,6 @@ LineInfo::LineInfo( const LineInfo& rLineInfo )
LineInfo::~LineInfo()
{
DBG_DTOR( LineInfo, NULL );
if( !( --mpImplLineInfo->mnRefCount ) )
delete mpImplLineInfo;
}
@ -112,8 +107,6 @@ LineInfo::~LineInfo()
LineInfo& LineInfo::operator=( const LineInfo& rLineInfo )
{
DBG_CHKTHIS( LineInfo, NULL );
DBG_CHKOBJ( &rLineInfo, LineInfo, NULL );
rLineInfo.mpImplLineInfo->mnRefCount++;
@ -128,8 +121,6 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo )
sal_Bool LineInfo::operator==( const LineInfo& rLineInfo ) const
{
DBG_CHKTHIS( LineInfo, NULL );
DBG_CHKOBJ( &rLineInfo, LineInfo, NULL );
return( mpImplLineInfo == rLineInfo.mpImplLineInfo ||
*mpImplLineInfo == *rLineInfo.mpImplLineInfo );
@ -152,7 +143,6 @@ void LineInfo::ImplMakeUnique()
void LineInfo::SetStyle( LineStyle eStyle )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->meStyle = eStyle;
}
@ -161,7 +151,6 @@ void LineInfo::SetStyle( LineStyle eStyle )
void LineInfo::SetWidth( long nWidth )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnWidth = nWidth;
}
@ -170,7 +159,6 @@ void LineInfo::SetWidth( long nWidth )
void LineInfo::SetDashCount( sal_uInt16 nDashCount )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnDashCount = nDashCount;
}
@ -179,7 +167,6 @@ void LineInfo::SetDashCount( sal_uInt16 nDashCount )
void LineInfo::SetDashLen( long nDashLen )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnDashLen = nDashLen;
}
@ -188,7 +175,6 @@ void LineInfo::SetDashLen( long nDashLen )
void LineInfo::SetDotCount( sal_uInt16 nDotCount )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnDotCount = nDotCount;
}
@ -197,7 +183,6 @@ void LineInfo::SetDotCount( sal_uInt16 nDotCount )
void LineInfo::SetDotLen( long nDotLen )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnDotLen = nDotLen;
}
@ -206,7 +191,6 @@ void LineInfo::SetDotLen( long nDotLen )
void LineInfo::SetDistance( long nDistance )
{
DBG_CHKTHIS( LineInfo, NULL );
ImplMakeUnique();
mpImplLineInfo->mnDistance = nDistance;
}
@ -215,7 +199,6 @@ void LineInfo::SetDistance( long nDistance )
void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin)
{
DBG_CHKTHIS( LineInfo, NULL );
if(eLineJoin != mpImplLineInfo->meLineJoin)
{
@ -228,7 +211,6 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin)
void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap)
{
DBG_CHKTHIS( LineInfo, NULL );
if(eLineCap != mpImplLineInfo->meLineCap)
{
ImplMakeUnique();

16
vcl/source/gdi/mapmod.cxx
View File

@ -22,7 +22,6 @@
#include <tools/debug.hxx>
#include <vcl/mapmod.hxx>
DBG_NAME( MapMode )
ImplMapMode::ImplMapMode() :
maOrigin( 0, 0 ),
@ -103,15 +102,12 @@ inline void MapMode::ImplMakeUnique()
MapMode::MapMode()
{
DBG_CTOR( MapMode, NULL );
mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL );
}
MapMode::MapMode( const MapMode& rMapMode )
{
DBG_CTOR( MapMode, NULL );
DBG_CHKOBJ( &rMapMode, MapMode, NULL );
DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
// Take over Shared Instance Data and increment refcount
@ -123,7 +119,6 @@ MapMode::MapMode( const MapMode& rMapMode )
MapMode::MapMode( MapUnit eUnit )
{
DBG_CTOR( MapMode, NULL );
mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( eUnit );
}
@ -131,7 +126,6 @@ MapMode::MapMode( MapUnit eUnit )
MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
const Fraction& rScaleX, const Fraction& rScaleY )
{
DBG_CTOR( MapMode, NULL );
mpImplMapMode = new ImplMapMode;
mpImplMapMode->meUnit = eUnit;
@ -142,7 +136,6 @@ MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
MapMode::~MapMode()
{
DBG_DTOR( MapMode, NULL );
// If it's not static ImpData and it's the last reference, delete it,
// else decrement refcounter
@ -157,7 +150,6 @@ MapMode::~MapMode()
void MapMode::SetMapUnit( MapUnit eUnit )
{
DBG_CHKTHIS( MapMode, NULL );
ImplMakeUnique();
mpImplMapMode->meUnit = eUnit;
@ -165,7 +157,6 @@ void MapMode::SetMapUnit( MapUnit eUnit )
void MapMode::SetOrigin( const Point& rLogicOrg )
{
DBG_CHKTHIS( MapMode, NULL );
ImplMakeUnique();
mpImplMapMode->maOrigin = rLogicOrg;
@ -173,7 +164,6 @@ void MapMode::SetOrigin( const Point& rLogicOrg )
void MapMode::SetScaleX( const Fraction& rScaleX )
{
DBG_CHKTHIS( MapMode, NULL );
ImplMakeUnique();
mpImplMapMode->maScaleX = rScaleX;
@ -181,7 +171,6 @@ void MapMode::SetScaleX( const Fraction& rScaleX )
void MapMode::SetScaleY( const Fraction& rScaleY )
{
DBG_CHKTHIS( MapMode, NULL );
ImplMakeUnique();
mpImplMapMode->maScaleY = rScaleY;
@ -189,8 +178,6 @@ void MapMode::SetScaleY( const Fraction& rScaleY )
MapMode& MapMode::operator=( const MapMode& rMapMode )
{
DBG_CHKTHIS( MapMode, NULL );
DBG_CHKOBJ( &rMapMode, MapMode, NULL );
DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
// First increment refcount so that we can reference ourselves
@ -215,8 +202,6 @@ MapMode& MapMode::operator=( const MapMode& rMapMode )
sal_Bool MapMode::operator==( const MapMode& rMapMode ) const
{
DBG_CHKTHIS( MapMode, NULL );
DBG_CHKOBJ( &rMapMode, MapMode, NULL );
if ( mpImplMapMode == rMapMode.mpImplMapMode )
return sal_True;
@ -232,7 +217,6 @@ sal_Bool MapMode::operator==( const MapMode& rMapMode ) const
sal_Bool MapMode::IsDefault() const
{
DBG_CHKTHIS( MapMode, NULL );
ImplMapMode* pDefMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL );
if ( mpImplMapMode == pDefMapMode )

41
vcl/source/gdi/outdev.cxx
View File

@ -63,19 +63,15 @@
using namespace ::com::sun::star;
DBG_NAME( OutputDevice )
#ifdef DISABLE_DYNLOADING
// Linking all needed LO code into one .so/executable, these already
// exist in the tools library, so put them in the anonymous namespace
// here to avoid clash...
namespace {
#endif
DBG_NAME( Polygon )
DBG_NAME( PolyPolygon )
#ifdef DISABLE_DYNLOADING
}
#endif
DBG_NAMEEX( Region )
#ifdef DBG_UTIL
const char* ImplDbgCheckOutputDevice( const void* pObj )
@ -326,7 +322,6 @@ OutputDevice::OutputDevice() :
maTextLineColor( COL_TRANSPARENT ),
maSettings( Application::GetSettings() )
{
DBG_CTOR( OutputDevice, ImplDbgCheckOutputDevice );
mpGraphics = NULL;
mpUnoGraphicsList = NULL;
@ -407,7 +402,6 @@ OutputDevice::OutputDevice() :
OutputDevice::~OutputDevice()
{
DBG_DTOR( OutputDevice, ImplDbgCheckOutputDevice );
if ( GetUnoGraphicsList() )
{
@ -1030,7 +1024,6 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion )
void OutputDevice::SetClipRegion()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaClipRegionAction( Region(), sal_False ) );
@ -1043,7 +1036,6 @@ void OutputDevice::SetClipRegion()
void OutputDevice::SetClipRegion( const Region& rRegion )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaClipRegionAction( rRegion, sal_True ) );
@ -1064,14 +1056,12 @@ void OutputDevice::SetClipRegion( const Region& rRegion )
Region OutputDevice::GetClipRegion() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
return PixelToLogic( maRegion );
}
Region OutputDevice::GetActiveClipRegion() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( GetOutDevType() == OUTDEV_WINDOW )
{
@ -1092,7 +1082,6 @@ Region OutputDevice::GetActiveClipRegion() const
void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mbClipRegion )
{
@ -1110,7 +1099,6 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove )
void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaISectRectClipRegionAction( rRect ) );
@ -1126,7 +1114,6 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
void OutputDevice::IntersectClipRegion( const Region& rRegion )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if(!rRegion.IsNull())
{
@ -1145,7 +1132,6 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion )
void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
mnDrawMode = nDrawMode;
@ -1155,7 +1141,6 @@ void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
void OutputDevice::SetRasterOp( RasterOp eRasterOp )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) );
@ -1175,7 +1160,6 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
void OutputDevice::SetLineColor()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaLineColorAction( Color(), sal_False ) );
@ -1234,7 +1218,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
void OutputDevice::SetLineColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor = ImplDrawModeToColor( rColor );
@ -1266,7 +1249,6 @@ void OutputDevice::SetLineColor( const Color& rColor )
void OutputDevice::SetFillColor()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaFillColorAction( Color(), sal_False ) );
@ -1284,7 +1266,6 @@ void OutputDevice::SetFillColor()
void OutputDevice::SetFillColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor( rColor );
@ -1353,7 +1334,6 @@ void OutputDevice::SetFillColor( const Color& rColor )
void OutputDevice::SetBackground()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
maBackground = Wallpaper();
mbBackground = sal_False;
@ -1364,7 +1344,6 @@ void OutputDevice::SetBackground()
void OutputDevice::SetBackground( const Wallpaper& rBackground )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
maBackground = rBackground;
@ -1379,7 +1358,6 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground )
void OutputDevice::SetRefPoint()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRefPointAction( Point(), sal_False ) );
@ -1393,7 +1371,6 @@ void OutputDevice::SetRefPoint()
void OutputDevice::SetRefPoint( const Point& rRefPoint )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRefPointAction( rRefPoint, sal_True ) );
@ -1407,7 +1384,6 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint )
void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaLineAction( rStartPt, rEndPt ) );
@ -1604,7 +1580,6 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
const LineInfo& rLineInfo )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( rLineInfo.IsDefault() )
{
@ -1655,7 +1630,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
void OutputDevice::DrawRect( const Rectangle& rRect )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRectAction( rRect ) );
@ -1693,8 +1667,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect )
void OutputDevice::DrawPolyLine( const Polygon& rPoly )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rPoly, Polygon, NULL );
if( mpMetaFile )
mpMetaFile->AddAction( new MetaPolyLineAction( rPoly ) );
@ -1768,8 +1740,6 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rPoly, Polygon, NULL );
if ( rLineInfo.IsDefault() )
{
@ -1857,8 +1827,6 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI
void OutputDevice::DrawPolygon( const Polygon& rPoly )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rPoly, Polygon, NULL );
if( mpMetaFile )
mpMetaFile->AddAction( new MetaPolygonAction( rPoly ) );
@ -1950,8 +1918,6 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL );
if( mpMetaFile )
mpMetaFile->AddAction( new MetaPolyPolygonAction( rPolyPoly ) );
@ -2064,7 +2030,6 @@ void OutputDevice::DrawPolygon( const ::basegfx::B2DPolygon& rB2DPolygon)
void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mpMetaFile )
mpMetaFile->AddAction( new MetaPolyPolygonAction( PolyPolygon( rB2DPolyPoly ) ) );
@ -2242,7 +2207,6 @@ void OutputDevice::DrawPolyLine(
basegfx::B2DLineJoin eLineJoin,
com::sun::star::drawing::LineCap eLineCap)
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mpMetaFile )
{
@ -2351,7 +2315,6 @@ sal_uInt32 OutputDevice::GetGCStackDepth() const
void OutputDevice::Push( sal_uInt16 nFlags )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaPushAction( nFlags ) );
@ -2435,7 +2398,6 @@ void OutputDevice::Push( sal_uInt16 nFlags )
void OutputDevice::Pop()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mpMetaFile )
mpMetaFile->AddAction( new MetaPopAction() );
@ -2548,7 +2510,6 @@ void OutputDevice::SetSettings( const AllSettings& rSettings )
sal_uInt16 OutputDevice::GetBitCount() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( meOutDevType == OUTDEV_VIRDEV )
return ((VirtualDevice*)this)->mnBitCount;
@ -2565,7 +2526,6 @@ sal_uInt16 OutputDevice::GetBitCount() const
sal_uInt16 OutputDevice::GetAlphaBitCount() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( meOutDevType == OUTDEV_VIRDEV &&
mpAlphaVDev != NULL )
@ -2578,7 +2538,6 @@ sal_uInt16 OutputDevice::GetAlphaBitCount() const
sal_uLong OutputDevice::GetColorCount() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
const sal_uInt16 nBitCount = GetBitCount();
return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uLong) 1 ) << nBitCount) );

16
vcl/source/gdi/outdev2.cxx
View File

@ -39,7 +39,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
DBG_NAMEEX( OutputDevice )
#define OUTDEV_INIT() \
{ \
@ -225,7 +224,6 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect
void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPt, const Size& rSrcSize )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
if( ImplIsRecordLayout() )
@ -278,8 +276,6 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPt, const Size& rSrcSize,
const OutputDevice& rOutDev )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rOutDev, OutputDevice, ImplDbgCheckOutputDevice );
DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
DBG_ASSERT( rOutDev.meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
@ -348,7 +344,6 @@ void OutputDevice::CopyArea( const Point& rDestPt,
const Point& rSrcPt, const Size& rSrcSize,
sal_uInt16 nFlags )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_ASSERT( meOutDevType != OUTDEV_PRINTER, "Don't use OutputDevice::CopyArea(...) with printer devices!" );
if ( meOutDevType == OUTDEV_PRINTER || ImplIsRecordLayout() )
@ -411,7 +406,6 @@ void OutputDevice::CopyArea( const Point& rDestPt,
void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
const OutputDevice& rOutDev, const Region& rRegion )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
GDIMetaFile* pOldMetaFile = mpMetaFile;
bool bOldMap = mbMap;
@ -457,7 +451,6 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
OutputDevice& rDev )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
bool bOldMap = mbMap;
mbMap = false;
@ -514,7 +507,6 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const sal_uLong nAction )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( ( mnDrawMode & DRAWMODE_NOBITMAP ) )
{
@ -902,7 +894,6 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx, const sal_uLong nAction )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
OSL_ENSURE(TRANSPARENT_NONE != rBitmapEx.GetTransparentType(), "ImplDrawBitmapEx not needed, no transparency in BitmapEx (!)");
if ( mnDrawMode & DRAWMODE_NOBITMAP )
@ -1222,7 +1213,6 @@ void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
const Bitmap& rBitmap, const Color& rMaskColor,
const sal_uLong nAction )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( ROP_INVERT == meRasterOp )
{
@ -1416,7 +1406,6 @@ void OutputDevice::DrawImage( const Point& rPos, const Size& rSize,
Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
OSL_ENSURE(OUTDEV_PRINTER != GetOutDevType(), "OutputDevice::GetBitmap with sorce type OUTDEV_PRINTER should not be used (!)");
Bitmap aBmp;
@ -1521,7 +1510,6 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// #110958# Extract alpha value from VDev, if any
if( mpAlphaVDev )
@ -1540,7 +1528,6 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con
Color OutputDevice::GetPixel( const Point& rPt ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor;
@ -1564,7 +1551,6 @@ Color OutputDevice::GetPixel( const Point& rPt ) const
void OutputDevice::DrawPixel( const Point& rPt )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaPointAction( rPt ) );
@ -1596,7 +1582,6 @@ void OutputDevice::DrawPixel( const Point& rPt )
void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor = ImplDrawModeToColor( rColor );
@ -1631,7 +1616,6 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors )
DrawPixel( rPts, GetLineColor() );
else
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_ASSERT( pColors, "OutputDevice::DrawPixel: No color array specified" );
const sal_uInt16 nSize = rPts.GetSize();

40
vcl/source/gdi/outdev3.cxx
View File

@ -91,8 +91,6 @@
#include <algorithm>
DBG_NAMEEX( OutputDevice )
DBG_NAMEEX( Font )
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@ -4885,8 +4883,6 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
void OutputDevice::SetFont( const Font& rNewFont )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rNewFont, Font, NULL );
Font aFont( rNewFont );
aFont.SetLanguage(rNewFont.GetLanguage());
@ -5016,7 +5012,6 @@ void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage )
void OutputDevice::SetTextColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor( rColor );
@ -5059,7 +5054,6 @@ void OutputDevice::SetTextColor( const Color& rColor )
void OutputDevice::SetTextFillColor()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaTextFillColorAction( Color(), sal_False ) );
@ -5075,7 +5069,6 @@ void OutputDevice::SetTextFillColor()
void OutputDevice::SetTextFillColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor( rColor );
sal_Bool bTransFill = ImplIsColorTransparent( aColor ) ? sal_True : sal_False;
@ -5134,7 +5127,6 @@ Color OutputDevice::GetTextFillColor() const
void OutputDevice::SetTextLineColor()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaTextLineColorAction( Color(), sal_False ) );
@ -5147,7 +5139,6 @@ void OutputDevice::SetTextLineColor()
void OutputDevice::SetTextLineColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor( rColor );
@ -5187,7 +5178,6 @@ void OutputDevice::SetTextLineColor( const Color& rColor )
void OutputDevice::SetOverlineColor()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaOverlineColorAction( Color(), sal_False ) );
@ -5200,7 +5190,6 @@ void OutputDevice::SetOverlineColor()
void OutputDevice::SetOverlineColor( const Color& rColor )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Color aColor( rColor );
@ -5240,7 +5229,6 @@ void OutputDevice::SetOverlineColor( const Color& rColor )
void OutputDevice::SetTextAlign( TextAlign eAlign )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaTextAlignAction( eAlign ) );
@ -5261,7 +5249,6 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
FontUnderline eOverline,
sal_Bool bUnderlineAbove )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaTextLineAction( rPos, nWidth, eStrikeout, eUnderline, eOverline ) );
@ -5302,7 +5289,6 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos,
sal_uInt16 nStyle )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
return;
@ -5378,7 +5364,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText;
}
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, " OutputDevice::DrawText(\"%s\")\n",
@ -5450,7 +5435,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
long OutputDevice::GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
long nWidth = GetTextArray( rStr, NULL, nIndex, nLen );
@ -5459,7 +5443,6 @@ long OutputDevice::GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int
long OutputDevice::GetTextHeight() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mbNewFont )
if( !ImplNewFont() )
@ -5485,7 +5468,6 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry,
xub_StrLen nIndex, xub_StrLen nLen )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaTextArrayAction( rStartPt, rStr, pDXAry, nIndex, nLen ) );
@ -5514,7 +5496,6 @@ long OutputDevice::GetTextArray( const OUString& rStr, sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen ) const
{
// MEM: default nLen = STRING_LENGTH
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( nIndex >= rStr.getLength() )
return 0;
@ -5561,7 +5542,6 @@ bool OutputDevice::GetCaretPositions( const OUString& rStr, sal_Int32* pCaretXAr
sal_Int32* pDXAry, long nLayoutWidth,
sal_Bool bCellBreaking ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( nIndex >= rStr.getLength() )
return false;
@ -5626,7 +5606,6 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth,
const OUString& rStr,
xub_StrLen nIndex, xub_StrLen nLen )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaStretchTextAction( rStartPt, nWidth, rStr, nIndex, nLen ) );
@ -5997,7 +5976,6 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth,
sal_Int32 nIndex, sal_Int32 nLen,
long nCharExtra ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
SalLayout* pSalLayout = ImplLayout( rStr, nIndex, nLen );
sal_Int32 nRetVal = -1;
@ -6030,7 +6008,6 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth,
sal_Int32 nIndex, sal_Int32 nLen,
long nCharExtra ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
rHyphenatorPos = -1;
@ -6353,7 +6330,6 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect,
sal_uInt16 nStyle,
GDIMetaFile& rMtf )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( rOrigStr.isEmpty() || rRect.IsEmpty() )
return;
@ -6392,7 +6368,6 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s
pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText;
}
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
bool bDecomposeTextRectAction = ( _pTextLayout != NULL ) && _pTextLayout->DecomposeTextRectAction();
if ( mpMetaFile && !bDecomposeTextRectAction )
@ -6432,7 +6407,6 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect,
TextRectInfo* pInfo,
const ::vcl::ITextLayout* _pTextLayout ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Rectangle aRect = rRect;
xub_StrLen nLines;
@ -6560,7 +6534,6 @@ static bool ImplIsCharIn( sal_Unicode c, const sal_Char* pStr )
OUString OutputDevice::GetEllipsisString( const OUString& rOrigStr, long nMaxWidth,
sal_uInt16 nStyle ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DefaultTextLayout aTextLayout( *const_cast< OutputDevice* >( this ) );
return ImplGetEllipsisString( *this, rOrigStr, nMaxWidth, nStyle, aTextLayout );
}
@ -6695,7 +6668,6 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr,
xub_StrLen nIndex, xub_StrLen nLen,
sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !IsDeviceOutputNecessary() || (nIndex >= rStr.getLength()) )
return;
@ -6825,7 +6797,6 @@ long OutputDevice::GetCtrlTextWidth( const OUString& rStr,
xub_StrLen nIndex, xub_StrLen nLen,
sal_uInt16 nStyle ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( nStyle & TEXT_DRAW_MNEMONIC )
{
@ -6882,7 +6853,6 @@ OUString OutputDevice::GetNonMnemonicString( const OUString& rStr, sal_Int32& rM
int OutputDevice::GetDevFontCount() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( !mpGetDevFontList )
mpGetDevFontList = mpFontList->GetDevFontList();
@ -6891,7 +6861,6 @@ int OutputDevice::GetDevFontCount() const
FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
FontInfo aFontInfo;
@ -6920,7 +6889,6 @@ FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
sal_Bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString& rFontName )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
ImplInitFontList();
@ -6940,7 +6908,6 @@ sal_Bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString&
int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
delete mpGetDevSizeList;
@ -6951,7 +6918,6 @@ int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const
Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// check range
int nCount = GetDevFontSizeCount( rFont );
@ -6983,7 +6949,6 @@ Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const
sal_Bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
ImplDevFontListData* pFound = mpFontList->FindFontFamily( rFontName );
return (pFound != NULL);
@ -6991,7 +6956,6 @@ sal_Bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
FontMetric OutputDevice::GetFontMetric() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
FontMetric aMetric;
if( mbNewFont && !ImplNewFont() )
@ -7091,7 +7055,6 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, const OUString& rStr, xub_StrLen nIndex, xub_StrLen nLen,
const sal_Int32* pDXAry) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
SystemTextLayoutData aSysLayoutData;
aSysLayoutData.nSize = sizeof(aSysLayoutData);
@ -7139,7 +7102,6 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
long OutputDevice::GetMinKashida() const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mbNewFont && !ImplNewFont() )
return 0;
@ -7174,7 +7136,6 @@ xub_StrLen OutputDevice::ValidateKashidas ( const OUString& rTxt,
sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr,
int nIndex, int nLen, int nBase, MetricVector& rVector )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
rVector.clear();
@ -7197,7 +7158,6 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect,
const OUString& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen,
sal_uLong nLayoutWidth, const sal_Int32* pDXAry ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
sal_Bool bRet = sal_False;
rRect.SetEmpty();

10
vcl/source/gdi/outdev4.cxx
View File

@ -56,8 +56,6 @@ extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 )
return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 );
}
DBG_NAMEEX( OutputDevice )
DBG_NAMEEX( Gradient )
void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly )
{
@ -564,8 +562,6 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
void OutputDevice::DrawGradient( const Rectangle& rRect,
const Gradient& rGradient )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
if ( mnDrawMode & DRAWMODE_NOGRADIENT )
return;
@ -692,8 +688,6 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
const Gradient& rGradient )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
if( mbInitClipRegion )
ImplInitClipRegion();
@ -913,8 +907,6 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& rGradient,
GDIMetaFile& rMtf )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
Rectangle aRect( rRect );
@ -954,7 +946,6 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r
void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Hatch aHatch( rHatch );
@ -1030,7 +1021,6 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& rHatch,
GDIMetaFile& rMtf )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
PolyPolygon aPolyPoly( rPolyPoly );
aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME | POLY_OPTIMIZE_CLOSE );

6
vcl/source/gdi/outdev5.cxx
View File

@ -33,14 +33,12 @@
// =======================================================================
DBG_NAMEEX( OutputDevice )
// =======================================================================
void OutputDevice::DrawRect( const Rectangle& rRect,
sal_uLong nHorzRound, sal_uLong nVertRound )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRoundRectAction( rRect, nHorzRound, nVertRound ) );
@ -98,7 +96,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
void OutputDevice::DrawEllipse( const Rectangle& rRect )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaEllipseAction( rRect ) );
@ -148,7 +145,6 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
void OutputDevice::DrawArc( const Rectangle& rRect,
const Point& rStartPt, const Point& rEndPt )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaArcAction( rRect, rStartPt, rEndPt ) );
@ -194,7 +190,6 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
void OutputDevice::DrawPie( const Rectangle& rRect,
const Point& rStartPt, const Point& rEndPt )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaPieAction( rRect, rStartPt, rEndPt ) );
@ -247,7 +242,6 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
void OutputDevice::DrawChord( const Rectangle& rRect,
const Point& rStartPt, const Point& rEndPt )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaChordAction( rRect, rStartPt, rEndPt ) );

5
vcl/source/gdi/outdev6.cxx
View File

@ -44,13 +44,11 @@
// ========================================================================
DBG_NAMEEX( OutputDevice )
// ------------------------------------------------------------------------
void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() );
aDstRect.Intersection( rRect );
@ -148,7 +146,6 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon
void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency)
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// AW: Do NOT paint empty PolyPolygons
if(!rB2DPolyPoly.count())
@ -212,7 +209,6 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
sal_uInt16 nTransparencePercent )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// short circuit for drawing an opaque polygon
if( (nTransparencePercent < 1) || ((mnDrawMode & DRAWMODE_NOTRANSPARENCY) != 0) )
@ -608,7 +604,6 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
const Size& rSize, const Gradient& rTransparenceGradient )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
const Color aBlack( COL_BLACK );

39
vcl/source/gdi/outmap.cxx
View File

@ -44,10 +44,6 @@
// =======================================================================
DBG_NAMEEX( OutputDevice )
DBG_NAMEEX( Polygon )
DBG_NAMEEX( PolyPolygon )
DBG_NAMEEX( Region )
// =======================================================================
@ -700,7 +696,6 @@ void OutputDevice::EnableMapMode( sal_Bool bEnable )
void OutputDevice::SetMapMode()
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaMapModeAction( MapMode() ) );
@ -735,7 +730,6 @@ void OutputDevice::SetMapMode()
void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
bool bRelMap = (rNewMapMode.GetMapUnit() == MAP_RELATIVE);
@ -836,7 +830,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode )
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// Ist der MapMode der gleiche wie vorher, dann mache nichts
if ( maMapMode == rNewMapMode )
@ -1021,7 +1014,6 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const
Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap )
return rLogicPt;
@ -1038,7 +1030,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const
Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap )
return rLogicSize;
@ -1055,7 +1046,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const
Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap || rLogicRect.IsEmpty() )
return rLogicRect;
@ -1078,8 +1068,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const
Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rLogicPoly, Polygon, NULL );
if ( !mbMap )
return rLogicPoly;
@ -1111,8 +1099,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const
PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rLogicPolyPoly, PolyPolygon, NULL );
if ( !mbMap )
return rLogicPolyPoly;
@ -1151,7 +1137,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo
Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if(!mbMap || rLogicRegion.IsNull() || rLogicRegion.IsEmpty())
{
@ -1206,7 +1191,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
Point OutputDevice::LogicToPixel( const Point& rLogicPt,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( rMapMode.IsDefault() )
return rLogicPt;
@ -1229,7 +1213,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt,
Size OutputDevice::LogicToPixel( const Size& rLogicSize,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( rMapMode.IsDefault() )
return rLogicSize;
@ -1252,7 +1235,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize,
Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( rMapMode.IsDefault() || rLogicRect.IsEmpty() )
return rLogicRect;
@ -1281,8 +1263,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect,
Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rLogicPoly, Polygon, NULL );
if ( rMapMode.IsDefault() )
return rLogicPoly;
@ -1320,8 +1300,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rLogicPolyPoly, PolyPolygon, NULL );
if ( rMapMode.IsDefault() )
return rLogicPolyPoly;
@ -1362,7 +1340,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi
Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if(rMapMode.IsDefault() || rLogicRegion.IsNull() || rLogicRegion.IsEmpty())
{
@ -1416,7 +1393,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM
Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap )
return rDevicePt;
@ -1433,7 +1409,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const
Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap )
return rDeviceSize;
@ -1450,7 +1425,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const
Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if ( !mbMap || rDeviceRect.IsEmpty() )
return rDeviceRect;
@ -1473,8 +1447,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const
Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rDevicePoly, Polygon, NULL );
if ( !mbMap )
return rDevicePoly;
@ -1506,8 +1478,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const
PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rDevicePolyPoly, PolyPolygon, NULL );
if ( !mbMap )
return rDevicePolyPoly;
@ -1534,7 +1504,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if(!mbMap || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty())
{
@ -1589,7 +1558,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
Point OutputDevice::PixelToLogic( const Point& rDevicePt,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// Ist Default-MapMode, dann bereche nichts
if ( rMapMode.IsDefault() )
@ -1613,7 +1581,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt,
Size OutputDevice::PixelToLogic( const Size& rDeviceSize,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// Ist Default-MapMode, dann bereche nichts
if ( rMapMode.IsDefault() )
@ -1637,7 +1604,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize,
Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
// Ist Default-MapMode, dann bereche nichts
if ( rMapMode.IsDefault() || rDeviceRect.IsEmpty() )
@ -1667,8 +1633,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect,
Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rDevicePoly, Polygon, NULL );
// Ist Default-MapMode, dann bereche nichts
if ( rMapMode.IsDefault() )
@ -1707,8 +1671,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly,
PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly,
const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
DBG_CHKOBJ( &rDevicePolyPoly, PolyPolygon, NULL );
if ( rMapMode.IsDefault() )
return rDevicePolyPoly;
@ -1749,7 +1711,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if(rMapMode.IsDefault() || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty())
{

6
vcl/source/gdi/region.cxx
View File

@ -34,9 +34,6 @@
//////////////////////////////////////////////////////////////////////////////
DBG_NAME( Region )
DBG_NAMEEX( Polygon )
DBG_NAMEEX( PolyPolygon )
//////////////////////////////////////////////////////////////////////////////
@ -341,7 +338,6 @@ Region::Region(const Polygon& rPolygon)
mpRegionBand(),
mbIsNull(false)
{
DBG_CHKOBJ( &rPolygon, Polygon, NULL );
if(rPolygon.GetSize())
{
@ -355,7 +351,6 @@ Region::Region(const PolyPolygon& rPolyPoly)
mpRegionBand(),
mbIsNull(false)
{
DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL );
if(rPolyPoly.Count())
{
@ -369,7 +364,6 @@ Region::Region(const basegfx::B2DPolyPolygon& rPolyPoly)
mpRegionBand(),
mbIsNull(false)
{
DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL );
if(rPolyPoly.count())
{

44
vcl/source/gdi/regionband.cxx
View File

@ -23,9 +23,6 @@
//////////////////////////////////////////////////////////////////////////////
DBG_NAME( RegionBand )
DBG_NAMEEX( Polygon )
DBG_NAMEEX( PolyPolygon )
//////////////////////////////////////////////////////////////////////////////
@ -33,7 +30,6 @@ RegionBand::RegionBand()
: mpFirstBand(0),
mpLastCheckedBand(0)
{
DBG_CTOR(RegionBand, ImplDbgTestRegionBand);
}
RegionBand::RegionBand(const RegionBand& rRef)
@ -41,7 +37,6 @@ RegionBand::RegionBand(const RegionBand& rRef)
mpLastCheckedBand(0)
{
*this = rRef;
DBG_CTOR(RegionBand, ImplDbgTestRegionBand);
}
RegionBand& RegionBand::operator=(const RegionBand& rRef)
@ -67,8 +62,6 @@ RegionBand& RegionBand::operator=(const RegionBand& rRef)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
DBG_CHKOBJ(&rRef, RegionBand, ImplDbgTestRegionBand);
return *this;
}
@ -88,7 +81,6 @@ RegionBand::RegionBand(const Rectangle& rRect)
// Set left and right boundaries of the band
mpFirstBand->Union(nLeft, nRight);
DBG_CTOR(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::implReset()
@ -104,19 +96,15 @@ void RegionBand::implReset()
mpLastCheckedBand = 0;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
RegionBand::~RegionBand()
{
implReset();
DBG_DTOR(RegionBand, ImplDbgTestRegionBand);
}
bool RegionBand::operator==( const RegionBand& rRegionBand ) const
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
DBG_CHKOBJ(&rRegionBand, RegionBand, ImplDbgTestRegionBand);
// initialise pointers
ImplRegionBand* pOwnRectBand = mpFirstBand;
@ -272,12 +260,10 @@ void RegionBand::load(SvStream& rIStrm)
rIStrm >> nTmp16;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::save(SvStream& rOStrm) const
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
ImplRegionBand* pBand = mpFirstBand;
while(pBand)
@ -346,7 +332,6 @@ void RegionBand::InsertBand(ImplRegionBand* pPreviousBand, ImplRegionBand* pBand
pBandToInsert->mpPrevBand = pPreviousBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::processPoints()
@ -360,7 +345,6 @@ void RegionBand::processPoints()
pRegionBand = pRegionBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
/** This function is similar to the RegionBand::InsertBands() method.
@ -409,7 +393,6 @@ void RegionBand::ImplAddMissingBands(const long nTop, const long nBottom)
nBottom));
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::CreateBandRange(long nYTop, long nYBottom)
@ -435,7 +418,6 @@ void RegionBand::CreateBandRange(long nYTop, long nYBottom)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId)
@ -445,7 +427,6 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
// lines consisting of a single point do not interest here
if ( rStartPt == rEndPt )
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -527,7 +508,6 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
InsertPoint( Point( nEndX, nEndY ), nLineId, true, eLineType );
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -550,7 +530,6 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
if ( rPoint.Y() == mpLastCheckedBand->mnYTop )
{
mpLastCheckedBand->InsertPoint( rPoint.X(), nLineID, bEndPoint, eLineType );
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -568,7 +547,6 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
if ( rPoint.Y() == mpLastCheckedBand->mnYTop )
{
mpLastCheckedBand->InsertPoint( rPoint.X(), nLineID, bEndPoint, eLineType );
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -583,7 +561,6 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
// reinitialize pointer (should never be reached!)
mpLastCheckedBand = mpFirstBand;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return false;
}
@ -666,7 +643,6 @@ bool RegionBand::OptimizeBandList()
}
#endif
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return (0 != mpFirstBand);
}
@ -692,7 +668,6 @@ void RegionBand::Move(long nHorzMove, long nVertMove)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::Scale(double fScaleX, double fScaleY)
@ -717,7 +692,6 @@ void RegionBand::Scale(double fScaleX, double fScaleY)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::InsertBands(long nTop, long nBottom)
@ -727,7 +701,6 @@ void RegionBand::InsertBands(long nTop, long nBottom)
{
// add band with boundaries of the rectangle
mpFirstBand = new ImplRegionBand( nTop, nBottom );
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return;
}
@ -800,7 +773,6 @@ void RegionBand::InsertBands(long nTop, long nBottom)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
@ -808,7 +780,6 @@ bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
// boundary already included in band with height 1? -> nothing to do!
if ( (pBand->mnYTop == pBand->mnYBottom) && (nYBandPosition == pBand->mnYTop) )
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -826,7 +797,6 @@ bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
pBand->mnYBottom = nYBandPosition;
pBand->mpNextBand = pNewBand;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -853,7 +823,6 @@ bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
pBand->mnYBottom = nYBandPosition - 1;
pBand->mpNextBand = pNewBand;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -871,7 +840,6 @@ bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
// append band to the list
pBand->mpNextBand = pNewBand;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
@ -882,12 +850,10 @@ bool RegionBand::InsertSingleBand(ImplRegionBand* pBand, long nYBandPosition)
// append band to the list
pBand->mpNextBand = pNewBand;
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return false;
}
@ -925,7 +891,6 @@ void RegionBand::Union(long nLeft, long nTop, long nRight, long nBottom)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::Intersect(long nLeft, long nTop, long nRight, long nBottom)
@ -962,7 +927,6 @@ void RegionBand::Intersect(long nLeft, long nTop, long nRight, long nBottom)
}
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::Union(const RegionBand& rSource)
@ -987,7 +951,6 @@ void RegionBand::Union(const RegionBand& rSource)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::Exclude(long nLeft, long nTop, long nRight, long nBottom)
@ -1029,7 +992,6 @@ void RegionBand::Exclude(long nLeft, long nTop, long nRight, long nBottom)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::XOr(long nLeft, long nTop, long nRight, long nBottom)
@ -1071,7 +1033,6 @@ void RegionBand::XOr(long nLeft, long nTop, long nRight, long nBottom)
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
void RegionBand::Intersect(const RegionBand& rSource)
@ -1153,7 +1114,6 @@ void RegionBand::Intersect(const RegionBand& rSource)
}
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
}
bool RegionBand::Exclude(const RegionBand& rSource)
@ -1178,20 +1138,17 @@ bool RegionBand::Exclude(const RegionBand& rSource)
// to test less bands, already check in the loop
if ( !OptimizeBandList() )
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return false;
}
pBand = pBand->mpNextBand;
}
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
return true;
}
Rectangle RegionBand::GetBoundRect() const
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
// get the boundaries of the first band
long nYTop(mpFirstBand->mnYTop);
@ -1238,7 +1195,6 @@ void RegionBand::XOr(const RegionBand& rSource)
bool RegionBand::IsInside(const Point& rPoint) const
{
DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
// search band list
ImplRegionBand* pBand = mpFirstBand;

25
vcl/source/gdi/wall.cxx
View File

@ -27,7 +27,6 @@
#include <wall2.hxx>
#include <vcl/dibtools.hxx>
DBG_NAME( Wallpaper )
// -----------------------------------------------------------------------
@ -202,7 +201,6 @@ inline void Wallpaper::ImplMakeUnique( sal_Bool bReleaseCache )
Wallpaper::Wallpaper()
{
DBG_CTOR( Wallpaper, NULL );
static ImplWallpaper aStaticImplWallpaper;
@ -214,8 +212,6 @@ Wallpaper::Wallpaper()
Wallpaper::Wallpaper( const Wallpaper& rWallpaper )
{
DBG_CTOR( Wallpaper, NULL );
DBG_CHKOBJ( &rWallpaper, Wallpaper, NULL );
DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" );
// Instance Daten uebernehmen und Referenzcounter erhoehen
@ -229,7 +225,6 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper )
Wallpaper::Wallpaper( const Color& rColor )
{
DBG_CTOR( Wallpaper, NULL );
mpImplWallpaper = new ImplWallpaper;
mpImplWallpaper->maColor = rColor;
@ -240,7 +235,6 @@ Wallpaper::Wallpaper( const Color& rColor )
Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
{
DBG_CTOR( Wallpaper, NULL );
mpImplWallpaper = new ImplWallpaper;
mpImplWallpaper->mpBitmap = new BitmapEx( rBmpEx );
@ -251,7 +245,6 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
Wallpaper::Wallpaper( const Gradient& rGradient )
{
DBG_CTOR( Wallpaper, NULL );
mpImplWallpaper = new ImplWallpaper;
mpImplWallpaper->mpGradient = new Gradient( rGradient );
@ -262,7 +255,6 @@ Wallpaper::Wallpaper( const Gradient& rGradient )
Wallpaper::~Wallpaper()
{
DBG_DTOR( Wallpaper, NULL );
// Wenn es keine statischen ImpDaten sind, dann loeschen, wenn es
// die letzte Referenz ist, sonst Referenzcounter decrementieren
@ -279,7 +271,6 @@ Wallpaper::~Wallpaper()
void Wallpaper::SetColor( const Color& rColor )
{
DBG_CHKTHIS( Wallpaper, NULL );
ImplMakeUnique();
mpImplWallpaper->maColor = rColor;
@ -292,7 +283,6 @@ void Wallpaper::SetColor( const Color& rColor )
const Color& Wallpaper::GetColor() const
{
DBG_CHKTHIS( Wallpaper, NULL );
return mpImplWallpaper->maColor;
}
@ -301,7 +291,6 @@ const Color& Wallpaper::GetColor() const
void Wallpaper::SetStyle( WallpaperStyle eStyle )
{
DBG_CHKTHIS( Wallpaper, NULL );
ImplMakeUnique( sal_False );
@ -317,7 +306,6 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle )
WallpaperStyle Wallpaper::GetStyle() const
{
DBG_CHKTHIS( Wallpaper, NULL );
return mpImplWallpaper->meStyle;
}
@ -326,7 +314,6 @@ WallpaperStyle Wallpaper::GetStyle() const
void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
{
DBG_CHKTHIS( Wallpaper, NULL );
if ( !rBitmap )
{
@ -354,7 +341,6 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
BitmapEx Wallpaper::GetBitmap() const
{
DBG_CHKTHIS( Wallpaper, NULL );
if ( mpImplWallpaper->mpBitmap )
return *(mpImplWallpaper->mpBitmap);
@ -369,7 +355,6 @@ BitmapEx Wallpaper::GetBitmap() const
sal_Bool Wallpaper::IsBitmap() const
{
DBG_CHKTHIS( Wallpaper, NULL );
return (mpImplWallpaper->mpBitmap != 0);
}
@ -379,7 +364,6 @@ sal_Bool Wallpaper::IsBitmap() const
void Wallpaper::SetGradient( const Gradient& rGradient )
{
DBG_CHKTHIS( Wallpaper, NULL );
ImplMakeUnique();
@ -396,7 +380,6 @@ void Wallpaper::SetGradient( const Gradient& rGradient )
Gradient Wallpaper::GetGradient() const
{
DBG_CHKTHIS( Wallpaper, NULL );
if( WALLPAPER_APPLICATIONGRADIENT == mpImplWallpaper->meStyle )
return ImplGetApplicationGradient();
@ -413,7 +396,6 @@ Gradient Wallpaper::GetGradient() const
sal_Bool Wallpaper::IsGradient() const
{
DBG_CHKTHIS( Wallpaper, NULL );
return (mpImplWallpaper->mpGradient != 0);
}
@ -439,7 +421,6 @@ Gradient Wallpaper::ImplGetApplicationGradient() const
void Wallpaper::SetRect( const Rectangle& rRect )
{
DBG_CHKTHIS( Wallpaper, NULL );
ImplMakeUnique( sal_False );
@ -464,7 +445,6 @@ void Wallpaper::SetRect( const Rectangle& rRect )
Rectangle Wallpaper::GetRect() const
{
DBG_CHKTHIS( Wallpaper, NULL );
if ( mpImplWallpaper->mpRect )
return *(mpImplWallpaper->mpRect);
@ -479,7 +459,6 @@ Rectangle Wallpaper::GetRect() const
sal_Bool Wallpaper::IsRect() const
{
DBG_CHKTHIS( Wallpaper, NULL );
return (mpImplWallpaper->mpRect != 0);
}
@ -513,8 +492,6 @@ sal_Bool Wallpaper::IsScrollable() const
Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper )
{
DBG_CHKTHIS( Wallpaper, NULL );
DBG_CHKOBJ( &rWallpaper, Wallpaper, NULL );
DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" );
// Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
@ -540,8 +517,6 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper )
sal_Bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const
{
DBG_CHKTHIS( Wallpaper, NULL );
DBG_CHKOBJ( &rWallpaper, Wallpaper, NULL );
if ( mpImplWallpaper == rWallpaper.mpImplWallpaper )
return sal_True;

14
vcl/source/window/accel.cxx
View File

@ -45,7 +45,6 @@ public:
// =======================================================================
DBG_NAME( Accelerator )
// =======================================================================
@ -220,7 +219,6 @@ void Accelerator::ImplDeleteData()
void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
sal_Bool bEnable, Accelerator* pAutoAccel )
{
DBG_CHKTHIS( Accelerator, NULL );
DBG_ASSERT( nItemId, "Accelerator::InsertItem(): ItemId == 0" );
if ( rKeyCode.IsFunction() )
@ -275,7 +273,6 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
Accelerator::Accelerator()
{
DBG_CTOR( Accelerator, NULL );
ImplInit();
mpData = new ImplAccelData;
@ -288,8 +285,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) :
maHelpStr( rAccel.maHelpStr ),
maCurKeyCode( rAccel.maCurKeyCode )
{
DBG_CTOR( Accelerator, NULL );
DBG_CHKOBJ( &rAccel, Accelerator, NULL );
ImplInit();
mpData = new ImplAccelData;
@ -300,7 +295,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) :
Accelerator::Accelerator( const ResId& rResId )
{
DBG_CTOR( Accelerator, NULL );
ImplInit();
mpData = new ImplAccelData;
@ -328,7 +322,6 @@ void Accelerator::ImplLoadRes( const ResId& rResId )
Accelerator::~Accelerator()
{
DBG_DTOR( Accelerator, NULL );
// inform AccelManager about deleting the Accelerator
if ( mpDel )
@ -370,7 +363,6 @@ void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode )
void Accelerator::InsertItem( const ResId& rResId )
{
DBG_CHKTHIS( Accelerator, NULL );
sal_uLong nObjMask;
sal_uInt16 nAccelKeyId;
@ -405,7 +397,6 @@ void Accelerator::InsertItem( const ResId& rResId )
sal_uInt16 Accelerator::GetItemCount() const
{
DBG_CHKTHIS( Accelerator, NULL );
return (sal_uInt16)mpData->maIdList.size();
}
@ -414,7 +405,6 @@ sal_uInt16 Accelerator::GetItemCount() const
KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
{
DBG_CHKTHIS( Accelerator, NULL );
sal_uInt16 nIndex = ImplAccelEntryGetFirstPos( &(mpData->maIdList), nItemId );
if ( nIndex != ACCELENTRY_NOTFOUND )
@ -427,7 +417,6 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( Accelerator, NULL );
ImplAccelEntry* pEntry = ( nPos < mpData->maIdList.size() ) ? mpData->maIdList[ nPos ] : NULL;
if ( pEntry )
@ -440,7 +429,6 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
{
DBG_CHKTHIS( Accelerator, NULL );
sal_uInt16 nIndex = ImplAccelEntryGetIndex( &(mpData->maIdList), nItemId );
if ( nIndex != ACCELENTRY_NOTFOUND )
@ -453,8 +441,6 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
Accelerator& Accelerator::operator=( const Accelerator& rAccel )
{
DBG_CHKTHIS( Accelerator, NULL );
DBG_CHKOBJ( &rAccel, Accelerator, NULL );
// assign new data
maHelpStr = rAccel.maHelpStr;

7
vcl/source/window/accmgr.cxx
View File

@ -26,7 +26,6 @@
// =======================================================================
DBG_NAMEEX( Accelerator )
// =======================================================================
@ -135,7 +134,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
if ( mpSequenceList )
{
pAccel = mpSequenceList->empty() ? NULL : (*mpSequenceList)[ 0 ];
DBG_CHKOBJ( pAccel, Accelerator, NULL );
// not found ?
if ( !pAccel )
@ -154,7 +152,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
// is an accelerator coupled ?
if ( pNextAccel )
{
DBG_CHKOBJ( pNextAccel, Accelerator, NULL );
mpSequenceList->insert( mpSequenceList->begin(), pNextAccel );
@ -182,7 +179,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
// did the accelerator survive the call
if ( !bDel )
{
DBG_CHKOBJ( pAccel, Accelerator, NULL );
pAccel->maCurKeyCode = KeyCode();
pAccel->mnCurId = 0;
pAccel->mnCurRepeat = 0;
@ -212,7 +208,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
for ( size_t i = 0, n = mpAccelList->size(); i < n; ++i )
{
pAccel = (*mpAccelList)[ i ];
DBG_CHKOBJ( pAccel, Accelerator, NULL );
// is the entry contained ?
ImplAccelEntry* pEntry = pAccel->ImplGetAccelData( rKeyCode );
@ -223,7 +218,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
// is an accelerator assigned ?
if ( pNextAccel )
{
DBG_CHKOBJ( pNextAccel, Accelerator, NULL );
// create sequence list
mpSequenceList = new ImplAccelList;
@ -256,7 +250,6 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe
// if the accelerator did survive the call
if ( !bDel )
{
DBG_CHKOBJ( pAccel, Accelerator, NULL );
pAccel->maCurKeyCode = KeyCode();
pAccel->mnCurId = 0;
pAccel->mnCurRepeat = 0;

4
vcl/source/window/menu.cxx
View File

@ -80,7 +80,6 @@ struct MenuLayoutData : public ControlLayoutData
using namespace ::com::sun::star;
using namespace vcl;
DBG_NAME( Menu )
#define ITEMPOS_INVALID 0xFFFF
@ -916,7 +915,6 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow )
Menu::Menu()
{
DBG_CTOR( Menu, NULL );
bIsMenuBar = sal_False;
ImplInit();
}
@ -925,14 +923,12 @@ Menu::Menu()
// with the correct type (ie, MenuBar vs. PopupMenu)
Menu::Menu( sal_Bool bMenubar )
{
DBG_CTOR( Menu, NULL );
bIsMenuBar = bMenubar;
ImplInit();
}
Menu::~Menu()
{
DBG_DTOR( Menu, NULL );
vcl::LazyDeletor<Menu>::Undelete( this );

9
vcl/source/window/toolbox.cxx
View File

@ -50,7 +50,6 @@
// =======================================================================
DBG_NAMEEX( Window )
// =======================================================================
@ -1730,7 +1729,6 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, sal_Bool bNativeBu
sal_Bool ToolBox::ImplCalcItem()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// recalc required ?
if ( !mbCalc )
@ -2265,7 +2263,6 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems )
void ToolBox::ImplFormat( sal_Bool bResize )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// Has to re-formatted
if ( !mbFormat )
@ -2755,7 +2752,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( mbFormat )
ImplFormat();
@ -2919,7 +2915,6 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight )
void ToolBox::ImplDrawSpin( sal_Bool bUpperIn, sal_Bool bLowerIn )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_Bool bTmpUpper;
sal_Bool bTmpLower;
@ -3026,7 +3021,6 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h
void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPaint, sal_Bool bLayout )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( nPos >= mpData->m_aItems.size() )
return;
@ -3392,7 +3386,6 @@ void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem )
void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( bStart )
{
@ -3433,7 +3426,6 @@ void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow )
void ToolBox::ShowLine( sal_Bool bNext )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mbFormat = sal_True;
@ -3602,7 +3594,6 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa
}
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// Items not destroyed, in Select handler

181
vcl/source/window/window.cxx
View File

@ -109,10 +109,6 @@ using ::com::sun::star::awt::XTopWindow;
// =======================================================================
DBG_NAME( Window )
// =======================================================================
#define IMPL_PAINT_PAINT ((sal_uInt16)0x0001)
#define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002)
#define IMPL_PAINT_PAINTALLCHILDREN ((sal_uInt16)0x0004)
@ -1402,8 +1398,6 @@ SalGraphics* Window::ImplGetFrameGraphics() const
Window* Window::ImplFindWindow( const Point& rFramePos )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Window* pTempWindow;
Window* pFindWindow;
@ -4215,8 +4209,6 @@ void Window::ImplNewInputContext()
Window::Window( WindowType nType )
{
DBG_CTOR( Window, ImplDbgCheckWindow );
ImplInitWindowData( nType );
}
@ -4224,7 +4216,6 @@ Window::Window( WindowType nType )
Window::Window( Window* pParent, WinBits nStyle )
{
DBG_CTOR( Window, ImplDbgCheckWindow );
ImplInitWindowData( WINDOW_WINDOW );
ImplInit( pParent, nStyle, NULL );
@ -4235,8 +4226,6 @@ Window::Window( Window* pParent, WinBits nStyle )
Window::Window( Window* pParent, const ResId& rResId )
: mpWindowImpl(NULL)
{
DBG_CTOR( Window, ImplDbgCheckWindow );
rResId.SetRT( RSC_WINDOW );
WinBits nStyle = ImplInitRes( rResId );
ImplInitWindowData( WINDOW_WINDOW );
@ -4276,7 +4265,6 @@ Window::~Window()
{
vcl::LazyDeletor<Window>::Undelete( this );
DBG_DTOR( Window, ImplDbgCheckWindow );
DBG_ASSERT( !mpWindowImpl->mbInDtor, "~Window - already in DTOR!" );
@ -4739,10 +4727,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const
void Window::MouseMove( const MouseEvent& rMEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt );
if ( !Notify( aNEvt ) )
mpWindowImpl->mbMouseMove = sal_True;
@ -4752,10 +4736,6 @@ void Window::MouseMove( const MouseEvent& rMEvt )
void Window::MouseButtonDown( const MouseEvent& rMEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt );
if ( !Notify( aNEvt ) )
mpWindowImpl->mbMouseButtonDown = sal_True;
@ -4765,10 +4745,6 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt )
void Window::MouseButtonUp( const MouseEvent& rMEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt );
if ( !Notify( aNEvt ) )
mpWindowImpl->mbMouseButtonUp = sal_True;
@ -4778,10 +4754,6 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt )
void Window::KeyInput( const KeyEvent& rKEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt );
if ( !Notify( aNEvt ) )
mpWindowImpl->mbKeyInput = sal_True;
@ -4791,10 +4763,6 @@ void Window::KeyInput( const KeyEvent& rKEvt )
void Window::KeyUp( const KeyEvent& rKEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt );
if ( !Notify( aNEvt ) )
mpWindowImpl->mbKeyUp = sal_True;
@ -4810,10 +4778,6 @@ void Window::PrePaint()
void Window::Paint( const Rectangle& rRect )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect );
}
@ -4827,45 +4791,18 @@ void Window::PostPaint()
void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
void Window::Move() {}
void Window::Move()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
void Window::Resize() {}
// -----------------------------------------------------------------------
void Window::Activate() {}
void Window::Resize()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
void Window::Activate()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
void Window::Deactivate()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
void Window::Deactivate() {}
void Window::GetFocus()
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
if ( HasFocus() && mpWindowImpl->mpLastFocusWindow && !(mpWindowImpl->mnDlgCtrlFlags & WINDOW_DLGCTRL_WANTFOCUS) )
{
ImplDelData aDogtag( this );
@ -4882,10 +4819,6 @@ void Window::GetFocus()
void Window::LoseFocus()
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
NotifyEvent aNEvt( EVENT_LOSEFOCUS, this );
Notify( aNEvt );
}
@ -4894,10 +4827,6 @@ void Window::LoseFocus()
void Window::RequestHelp( const HelpEvent& rHEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// if Balloon-Help is requested, show the balloon
// with help text set
if ( rHEvt.GetMode() & HELPMODE_BALLOON )
@ -4950,10 +4879,6 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
void Window::Command( const CommandEvent& rCEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt );
NotifyEvent aNEvt( EVENT_COMMAND, this, &rCEvt );
@ -4965,7 +4890,6 @@ void Window::Command( const CommandEvent& rCEvt )
void Window::Tracking( const TrackingEvent& rTEvt )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this );
if( pWrapper )
@ -4976,14 +4900,12 @@ void Window::Tracking( const TrackingEvent& rTEvt )
void Window::UserEvent( sal_uLong, void* )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
void Window::StateChanged( StateChangedType eType )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
switch (eType)
{
//stuff that doesn't invalidate the layout
@ -5009,7 +4931,6 @@ void Window::StateChanged( StateChangedType eType )
void Window::DataChanged( const DataChangedEvent& )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
// -----------------------------------------------------------------------
@ -5117,10 +5038,6 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
long Window::PreNotify( NotifyEvent& rNEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
long bDone = sal_False;
if ( mpWindowImpl->mpParent && !ImplIsOverlapWindow() )
bDone = mpWindowImpl->mpParent->PreNotify( rNEvt );
@ -5164,10 +5081,6 @@ long Window::PreNotify( NotifyEvent& rNEvt )
long Window::Notify( NotifyEvent& rNEvt )
{
{ // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
long nRet = sal_False;
// check for docking window
@ -5371,7 +5284,6 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
sal_Bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVEvent* pSVEvent = new ImplSVEvent;
pSVEvent->mnEvent = 0;
@ -5396,7 +5308,6 @@ sal_Bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pC
void Window::RemoveUserEvent( sal_uLong nUserEvent )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVEvent* pSVEvent = (ImplSVEvent*)nUserEvent;
@ -5439,7 +5350,6 @@ sal_Bool Window::IsLocked( sal_Bool bChildren ) const
void Window::SetStyle( WinBits nStyle )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mnStyle != nStyle )
{
@ -5453,7 +5363,6 @@ void Window::SetStyle( WinBits nStyle )
void Window::SetExtendedStyle( WinBits nExtendedStyle )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mnExtendedStyle != nExtendedStyle )
{
@ -5480,7 +5389,6 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
SystemWindow* Window::GetSystemWindow() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
const Window* pWin = this;
while ( pWin && !pWin->IsSystemWindow() )
@ -5492,7 +5400,6 @@ SystemWindow* Window::GetSystemWindow() const
void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -5535,7 +5442,6 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
sal_uInt16 Window::GetBorderStyle() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -5552,7 +5458,6 @@ sal_uInt16 Window::GetBorderStyle() const
long Window::CalcTitleWidth() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -5583,7 +5488,6 @@ long Window::CalcTitleWidth() const
void Window::EnableClipSiblings( sal_Bool bClipSiblings )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->EnableClipSiblings( bClipSiblings );
@ -5595,7 +5499,6 @@ void Window::EnableClipSiblings( sal_Bool bClipSiblings )
void Window::SetMouseTransparent( sal_Bool bTransparent )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetMouseTransparent( bTransparent );
@ -5610,7 +5513,6 @@ void Window::SetMouseTransparent( sal_Bool bTransparent )
void Window::SetPaintTransparent( sal_Bool bTransparent )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// transparency is not useful for frames as the background would have to be provided by a different frame
if( bTransparent && mpWindowImpl->mbFrame )
@ -5626,7 +5528,6 @@ void Window::SetPaintTransparent( sal_Bool bTransparent )
void Window::SetInputContext( const InputContext& rInputContext )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mpWindowImpl->maInputContext = rInputContext;
if ( !mpWindowImpl->mbInFocusHdl && HasFocus() )
@ -5637,7 +5538,6 @@ void Window::SetInputContext( const InputContext& rInputContext )
void Window::EndExtTextInput( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbExtTextInput )
ImplGetFrame()->EndExtTextInput( nFlags );
@ -5647,7 +5547,6 @@ void Window::EndExtTextInput( sal_uInt16 nFlags )
void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplWinData* pWinData = ImplGetWinData();
if ( pWinData->mpCursorRect )
@ -5674,7 +5573,6 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
const Rectangle* Window::GetCursorRect() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplWinData* pWinData = ImplGetWinData();
return pWinData->mpCursorRect;
@ -5684,7 +5582,6 @@ const Rectangle* Window::GetCursorRect() const
long Window::GetCursorExtTextInputWidth() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplWinData* pWinData = ImplGetWinData();
return pWinData->mnCursorExtWidth;
@ -5693,7 +5590,6 @@ long Window::GetCursorExtTextInputWidth() const
// -----------------------------------------------------------------------
void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, sal_Bool bVertical ) {
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplWinData* pWinData = ImplGetWinData();
delete[] pWinData->mpCompositionCharRects;
@ -5716,7 +5612,6 @@ void Window::SetSettings( const AllSettings& rSettings )
void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -5754,7 +5649,6 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -5825,7 +5719,6 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
DataChanged( rDCEvt );
@ -5841,7 +5734,6 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
void Window::SetPointFont( const Font& rFont )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Font aFont = rFont;
ImplPointToLogic( aFont );
@ -5852,7 +5744,6 @@ void Window::SetPointFont( const Font& rFont )
Font Window::GetPointFont() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Font aFont = GetFont();
ImplLogicToPoint( aFont );
@ -5863,7 +5754,6 @@ Font Window::GetPointFont() const
void Window::SetParentClipMode( sal_uInt16 nMode )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetParentClipMode( nMode );
@ -5882,7 +5772,6 @@ void Window::SetParentClipMode( sal_uInt16 nMode )
sal_uInt16 Window::GetParentClipMode() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
return mpWindowImpl->mpBorderWindow->GetParentClipMode();
@ -5894,7 +5783,6 @@ sal_uInt16 Window::GetParentClipMode() const
void Window::SetWindowRegionPixel()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetWindowRegionPixel();
@ -5931,7 +5819,6 @@ void Window::SetWindowRegionPixel()
void Window::SetWindowRegionPixel( const Region& rRegion )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetWindowRegionPixel( rRegion );
@ -6020,7 +5907,6 @@ void Window::SetWindowRegionPixel( const Region& rRegion )
const Region& Window::GetWindowRegionPixel() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
return mpWindowImpl->mpBorderWindow->GetWindowRegionPixel();
@ -6032,7 +5918,6 @@ const Region& Window::GetWindowRegionPixel() const
sal_Bool Window::IsWindowRegionPixel() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
return mpWindowImpl->mpBorderWindow->IsWindowRegionPixel();
@ -6044,7 +5929,6 @@ sal_Bool Window::IsWindowRegionPixel() const
Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Region aWinClipRegion;
@ -6081,7 +5965,6 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
Region Window::GetPaintRegion() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpPaintRegion )
{
@ -6138,7 +6021,6 @@ static SystemWindow *ImplGetLastSystemWindow( Window *pWin )
void Window::SetParent( Window* pNewParent )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
DBG_ASSERT( pNewParent, "Window::SetParent(): pParent == NULL" );
DBG_ASSERT( pNewParent != this, "someone tried to reparent a window to itself" );
@ -6307,7 +6189,6 @@ void Window::SetParent( Window* pNewParent )
void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbVisible == bVisible )
return;
@ -6594,7 +6475,6 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
void Window::Enable( bool bEnable, bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !bEnable )
{
@ -6678,7 +6558,6 @@ bool Window::IsCallHandlersOnInputDisabled() const
void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_Bool bNotify = (bEnable != mpWindowImpl->mbInputDisabled);
if ( mpWindowImpl->mpBorderWindow )
@ -6745,7 +6624,6 @@ void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild, sal_Bool bSysWin,
const Window* pExcludeWindow )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
EnableInput( bEnable, bChild );
if ( bSysWin )
@ -6811,7 +6689,6 @@ void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild, sal_Bool bSysWin,
void Window::AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->AlwaysEnableInput( bAlways, sal_False );
@ -6843,7 +6720,6 @@ void Window::AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild )
void Window::AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->AlwaysDisableInput( bAlways, sal_False );
@ -6875,7 +6751,6 @@ void Window::AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild )
void Window::SetActivateMode( sal_uInt16 nMode )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->SetActivateMode( nMode );
@ -6909,7 +6784,6 @@ void Window::SetActivateMode( sal_uInt16 nMode )
void Window::ToTop( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplStartToTop( nFlags );
ImplFocusToTop( nFlags, IsReallyVisible() );
@ -6919,7 +6793,6 @@ void Window::ToTop( sal_uInt16 nFlags )
void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -7095,7 +6968,6 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
void Window::EnableAlwaysOnTop( sal_Bool bEnable )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mpWindowImpl->mbAlwaysOnTop = bEnable;
@ -7113,7 +6985,6 @@ void Window::EnableAlwaysOnTop( sal_Bool bEnable )
void Window::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
bool bHasValidSize = !mpWindowImpl->mbDefSize;
@ -7397,7 +7268,6 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, sal_Boo
void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplScroll( Rectangle( Point( mnOutOffX, mnOutOffY ),
Size( mnOutWidth, mnOutHeight ) ),
@ -7409,7 +7279,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
void Window::Scroll( long nHorzScroll, long nVertScroll,
const Rectangle& rRect, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Rectangle aRect = ImplLogicToDevicePixel( rRect );
aRect.Intersection( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ) );
@ -7421,7 +7290,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll,
void Window::Invalidate( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
return;
@ -7433,7 +7301,6 @@ void Window::Invalidate( sal_uInt16 nFlags )
void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
return;
@ -7450,7 +7317,6 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
return;
@ -7469,7 +7335,6 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
void Window::Validate( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
return;
@ -7481,7 +7346,6 @@ void Window::Validate( sal_uInt16 nFlags )
sal_Bool Window::HasPaintEvent() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !mpWindowImpl->mbReallyVisible )
return sal_False;
@ -7511,7 +7375,6 @@ sal_Bool Window::HasPaintEvent() const
void Window::Update()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpBorderWindow )
{
@ -7581,7 +7444,6 @@ void Window::Update()
void Window::Flush()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
const Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) );
mpWindowImpl->mpFrame->Flush( aWinRect );
@ -7591,7 +7453,6 @@ void Window::Flush()
void Window::Sync()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mpWindowImpl->mpFrame->Sync();
}
@ -7600,7 +7461,6 @@ void Window::Sync()
void Window::SetUpdateMode( sal_Bool bUpdate )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mpWindowImpl->mbNoUpdate = !bUpdate;
StateChanged( STATE_CHANGE_UPDATEMODE );
@ -7610,7 +7470,6 @@ void Window::SetUpdateMode( sal_Bool bUpdate )
void Window::GrabFocus()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplGrabFocus( 0 );
}
@ -7619,7 +7478,6 @@ void Window::GrabFocus()
sal_Bool Window::HasFocus() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// #107575# the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow()
// task was shifted to 6.y, so its commented out
@ -7661,7 +7519,6 @@ void Window::SetFakeFocus( bool bFocus )
sal_Bool Window::HasChildPathFocus( sal_Bool bSystemWindow ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// #107575#, the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow()
// task was shifted to 6.y, so its commented out
@ -7682,7 +7539,6 @@ sal_Bool Window::HasChildPathFocus( sal_Bool bSystemWindow ) const
void Window::CaptureMouse()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVData* pSVData = ImplGetSVData();
@ -7704,7 +7560,6 @@ void Window::CaptureMouse()
void Window::ReleaseMouse()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVData* pSVData = ImplGetSVData();
@ -7723,7 +7578,6 @@ void Window::ReleaseMouse()
sal_Bool Window::IsMouseCaptured() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
return (this == ImplGetSVData()->maWinData.mpCaptureWin);
}
@ -7732,7 +7586,6 @@ sal_Bool Window::IsMouseCaptured() const
void Window::SetPointer( const Pointer& rPointer )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->maPointer == rPointer )
return;
@ -7748,7 +7601,6 @@ void Window::SetPointer( const Pointer& rPointer )
void Window::EnableChildPointerOverwrite( sal_Bool bOverwrite )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbChildPtrOverwrite == bOverwrite )
return;
@ -7764,7 +7616,6 @@ void Window::EnableChildPointerOverwrite( sal_Bool bOverwrite )
void Window::SetPointerPosPixel( const Point& rPos )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Point aPos = ImplOutputToFrame( rPos );
if( ImplHasMirroredGraphics() )
@ -7788,7 +7639,6 @@ void Window::SetPointerPosPixel( const Point& rPos )
Point Window::GetPointerPosPixel()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Point aPos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY );
if( ImplIsAntiparallel() )
@ -7803,7 +7653,6 @@ Point Window::GetPointerPosPixel()
Point Window::GetLastPointerPosPixel()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Point aPos( mpWindowImpl->mpFrameData->mnBeforeLastMouseX, mpWindowImpl->mpFrameData->mnBeforeLastMouseY );
if( ImplIsAntiparallel() )
@ -7818,7 +7667,6 @@ Point Window::GetLastPointerPosPixel()
void Window::ShowPointer( sal_Bool bVisible )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbNoPtrVisible != !bVisible )
{
@ -7864,7 +7712,6 @@ sal_Bool Window::IsMouseOver()
void Window::EnterWait()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
mpWindowImpl->mnWaitCount++;
@ -7880,7 +7727,6 @@ void Window::EnterWait()
void Window::LeaveWait()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mnWaitCount )
{
@ -7899,7 +7745,6 @@ void Window::LeaveWait()
void Window::SetCursor( Cursor* pCursor )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpCursor != pCursor )
{
@ -7918,7 +7763,6 @@ void Window::SetText( const OUString& rStr )
if (rStr == mpWindowImpl->maText)
return;
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
OUString oldTitle( mpWindowImpl->maText );
mpWindowImpl->maText = rStr;
@ -7948,7 +7792,6 @@ void Window::SetText( const OUString& rStr )
OUString Window::GetText() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
return mpWindowImpl->maText;
}
@ -7957,7 +7800,6 @@ OUString Window::GetText() const
OUString Window::GetDisplayText() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
return GetText();
}
@ -7994,7 +7836,6 @@ const Wallpaper& Window::GetDisplayBackground() const
const OUString& Window::GetHelpText() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
OUString aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
bool bStrHelpId = !aStrHelpId.isEmpty();
@ -8032,7 +7873,6 @@ const OUString& Window::GetHelpText() const
Window* Window::FindWindow( const Point& rPos ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Point aPos = OutputToScreenPixel( rPos );
return ((Window*)this)->ImplFindWindow( aPos );
@ -8042,7 +7882,6 @@ Window* Window::FindWindow( const Point& rPos ) const
sal_uInt16 Window::GetChildCount() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_uInt16 nChildCount = 0;
Window* pChild = mpWindowImpl->mpFirstChild;
@ -8059,7 +7898,6 @@ sal_uInt16 Window::GetChildCount() const
Window* Window::GetChild( sal_uInt16 nChild ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_uInt16 nChildCount = 0;
Window* pChild = mpWindowImpl->mpFirstChild;
@ -8078,7 +7916,6 @@ Window* Window::GetChild( sal_uInt16 nChild ) const
Window* Window::GetWindow( sal_uInt16 nType ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
switch ( nType )
{
@ -8170,8 +8007,6 @@ Window* Window::GetWindow( sal_uInt16 nType ) const
sal_Bool Window::IsChild( const Window* pWindow, sal_Bool bSystemWindow ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
DBG_CHKOBJ( pWindow, Window, ImplDbgCheckWindow );
do
{
@ -8192,8 +8027,6 @@ sal_Bool Window::IsChild( const Window* pWindow, sal_Bool bSystemWindow ) const
sal_Bool Window::IsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
DBG_CHKOBJ( pWindow, Window, ImplDbgCheckWindow );
if ( this == pWindow )
return sal_True;
@ -8204,7 +8037,6 @@ sal_Bool Window::IsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow
const SystemEnvData* Window::GetSystemData() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
return mpWindowImpl->mpFrame ? mpWindowImpl->mpFrame->GetSystemData() : NULL;
}
@ -8334,7 +8166,6 @@ void Window::ImplStartDnd()
uno::Reference< XDropTarget > Window::GetDropTarget()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( ! mpWindowImpl->mxDNDListenerContainer.is() )
{
@ -8395,7 +8226,6 @@ uno::Reference< XDropTarget > Window::GetDropTarget()
uno::Reference< XDragSource > Window::GetDragSource()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
#if HAVE_FEATURE_DESKTOP
@ -8470,7 +8300,6 @@ uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer()
uno::Reference< XClipboard > Window::GetClipboard()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( mpWindowImpl->mpFrameData )
{
@ -8500,7 +8329,6 @@ uno::Reference< XClipboard > Window::GetClipboard()
uno::Reference< XClipboard > Window::GetPrimarySelection()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( mpWindowImpl->mpFrameData )
{
@ -8617,7 +8445,6 @@ sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirst
Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, sal_Bool bTopLevel ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( bTopLevel )
rChildCount = 0;

66
vcl/source/window/window2.cxx
View File

@ -49,10 +49,6 @@ using namespace com::sun::star;
// =======================================================================
DBG_NAMEEX( Window )
// =======================================================================
#define IMPL_MAXSAVEBACKSIZE (640*480)
#define IMPL_MAXALLSAVEBACKSIZE (800*600*2)
@ -67,9 +63,6 @@ struct ImplFocusDelData : public ImplDelData
sal_Bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
DBG_CHKOBJ( pTestWindow, Window, ImplDbgCheckWindow );
// check for overlapping window
pTestWindow = pTestWindow->ImplGetFirstOverlapWindow();
const Window* pTempWindow = pTestWindow;
@ -267,8 +260,6 @@ void Window::ImplDeleteOverlapBackground()
void Window::ImplInvalidateAllOverlapBackgrounds()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin;
while ( pWindow )
{
@ -302,8 +293,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds()
void Window::ShowFocus( const Rectangle& rRect )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( mpWindowImpl->mbInShowFocus )
return;
mpWindowImpl->mbInShowFocus = sal_True;
@ -351,7 +340,6 @@ void Window::ShowFocus( const Rectangle& rRect )
void Window::HideFocus()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if( mpWindowImpl->mbInHideFocus )
return;
@ -387,8 +375,6 @@ void Window::HideFocus()
void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() )
return;
@ -423,8 +409,6 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( !IsDeviceOutputNecessary() )
return;
@ -461,8 +445,6 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplWinData* pWinData = ImplGetWinData();
if ( !mpWindowImpl->mbInPaint || !(nFlags & SHOWTRACK_WINDOW) )
@ -491,8 +473,6 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
void Window::HideTracking()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbTrackVisible )
{
ImplWinData* pWinData = ImplGetWinData();
@ -506,8 +486,6 @@ void Window::HideTracking()
void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
if ( aRect.IsEmpty() )
@ -571,8 +549,6 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_uInt16 nPoints = rPoly.GetSize();
if ( nPoints < 2 )
@ -650,8 +626,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
void Window::StartTracking( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->maWinData.mpTrackWin != this )
@ -688,7 +662,6 @@ void Window::EndTracking( sal_uInt16 nFlags )
// due to DbgChkThis in brackets, as the window could be destroyed
// in the handler
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( pSVData->maWinData.mpTrackTimer )
{
@ -724,8 +697,6 @@ void Window::EndTracking( sal_uInt16 nFlags )
sal_Bool Window::IsTracking() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
return (ImplGetSVData()->maWinData.mpTrackWin == this);
}
@ -733,8 +704,6 @@ sal_Bool Window::IsTracking() const
void Window::StartAutoScroll( sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->maWinData.mpAutoScrollWin != this )
@ -752,8 +721,6 @@ void Window::StartAutoScroll( sal_uInt16 nFlags )
void Window::EndAutoScroll()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->maWinData.mpAutoScrollWin == this )
@ -771,8 +738,6 @@ void Window::EndAutoScroll()
void Window::SaveBackground( const Point& rPos, const Size& rSize,
const Point& rDestOff, VirtualDevice& rSaveDevice )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpPaintRegion )
{
Region aClip( *mpWindowImpl->mpPaintRegion );
@ -845,8 +810,6 @@ sal_Bool Window::EndSaveFocus( sal_uIntPtr nSaveId, sal_Bool bRestore )
void Window::SetZoom( const Fraction& rZoom )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->maZoom != rZoom )
{
mpWindowImpl->maZoom = rZoom;
@ -865,8 +828,6 @@ inline long WinFloatRound( double fVal )
void Window::SetZoomedPointFont( const Font& rFont )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
const Fraction& rZoom = GetZoom();
if ( rZoom.GetNumerator() != rZoom.GetDenominator() )
{
@ -907,7 +868,6 @@ void Window::SetZoomedPointFont( const Font& rFont )
long Window::CalcZoom( long nCalc ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
const Fraction& rZoom = GetZoom();
if ( rZoom.GetNumerator() != rZoom.GetDenominator() )
@ -924,8 +884,6 @@ long Window::CalcZoom( long nCalc ) const
void Window::SetControlFont()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpControlFont )
{
delete mpWindowImpl->mpControlFont;
@ -938,8 +896,6 @@ void Window::SetControlFont()
void Window::SetControlFont( const Font& rFont )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( rFont == Font() )
{
SetControlFont();
@ -962,8 +918,6 @@ void Window::SetControlFont( const Font& rFont )
Font Window::GetControlFont() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mpControlFont )
return *mpWindowImpl->mpControlFont;
else
@ -977,8 +931,6 @@ Font Window::GetControlFont() const
void Window::SetControlForeground()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbControlForeground )
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
@ -991,8 +943,6 @@ void Window::SetControlForeground()
void Window::SetControlForeground( const Color& rColor )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( rColor.GetTransparency() )
{
if ( mpWindowImpl->mbControlForeground )
@ -1017,8 +967,6 @@ void Window::SetControlForeground( const Color& rColor )
void Window::SetControlBackground()
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( mpWindowImpl->mbControlBackground )
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
@ -1031,8 +979,6 @@ void Window::SetControlBackground()
void Window::SetControlBackground( const Color& rColor )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
if ( rColor.GetTransparency() )
{
if ( mpWindowImpl->mbControlBackground )
@ -1057,8 +1003,6 @@ void Window::SetControlBackground( const Color& rColor )
Size Window::CalcWindowSize( const Size& rOutSz ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Size aSz = rOutSz;
aSz.Width() += mpWindowImpl->mnLeftBorder+mpWindowImpl->mnRightBorder;
aSz.Height() += mpWindowImpl->mnTopBorder+mpWindowImpl->mnBottomBorder;
@ -1069,8 +1013,6 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const
Size Window::CalcOutputSize( const Size& rWinSz ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Size aSz = rWinSz;
aSz.Width() -= mpWindowImpl->mnLeftBorder+mpWindowImpl->mnRightBorder;
aSz.Height() -= mpWindowImpl->mnTopBorder+mpWindowImpl->mnBottomBorder;
@ -1081,8 +1023,6 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
Font aFont = GetPointFont();
Size aFontSize = aFont.GetSize();
MapMode aPtMapMode( MAP_POINT );
@ -1095,8 +1035,6 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
long nP = nPixels;
if ( pDev->GetOutDevType() != OUTDEV_WINDOW )
{
@ -1146,8 +1084,6 @@ static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyBy
sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd,
ScrollBar* pHScrl, ScrollBar* pVScrl )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
sal_Bool bRet = sal_False;
if ( pHScrl || pVScrl )
@ -2035,7 +1971,6 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
void Window::set_height_request(sal_Int32 nHeightRequest)
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
@ -2048,7 +1983,6 @@ void Window::set_height_request(sal_Int32 nHeightRequest)
void Window::set_width_request(sal_Int32 nWidthRequest)
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;