From 7a2c109d0fcc7e097ad23cd096f061d982d0a2eb Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 23 Sep 2005 11:38:14 +0000 Subject: INTEGRATION: CWS dba201b (1.3.340); FILE MERGED 2005/09/21 09:52:16 oj 1.3.340.2: RESYNC: (1.3-1.4); FILE MERGED 2005/07/11 13:37:24 fs 1.3.340.1: merging CWS dba201 into CWS dba201b --- dbaccess/source/ui/misc/ToolBoxHelper.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dbaccess/source/ui/misc/ToolBoxHelper.cxx') diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 217006700dab..c22c25f708db 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ToolBoxHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:08:40 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:38:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,11 +57,14 @@ namespace dbaui { + DBG_NAME(OToolBoxHelper) OToolBoxHelper::OToolBoxHelper() : m_bIsHiContrast(sal_False) ,m_pToolBox(NULL) ,m_nBitmapSet(-1 ) { + DBG_CTOR(OToolBoxHelper,NULL); + OSL_ENSURE(m_nBitmapSet != getCurrentSymbolSet(),"BitmapSet should not be identical"); SvtMiscOptions().AddListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); @@ -71,6 +74,8 @@ namespace dbaui { SvtMiscOptions().RemoveListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); + + DBG_DTOR(OToolBoxHelper,NULL); } // ----------------------------------------------------------------------------- sal_Int16 OToolBoxHelper::getCurrentSymbolSet() -- cgit