INTEGRATION: CWS vcl20 (1.14.58); FILE MERGED

2004/03/10 18:52:33 pl 1.14.58.2: RESYNC: (1.14-1.15); FILE MERGED
2004/02/23 17:50:52 pl 1.14.58.1: #115527# do not use strcpy and friends
This commit is contained in:
Rüdiger Timm 2004-03-30 12:42:10 +00:00
parent 5b8d7ff960
commit 6b01989a8b

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: dbggui.cxx,v $ * $RCSfile: dbggui.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: kz $ $Date: 2004-02-26 13:15:18 $ * last change: $Author: rt $ $Date: 2004-03-30 13:42:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -64,8 +64,8 @@
#ifdef DBG_UTIL #ifdef DBG_UTIL
#include "svdata.hxx" #include "svdata.hxx"
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
#include <limits.h> #include <limits.h>
#include <svsys.h> #include <svsys.h>
@ -1200,10 +1200,10 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
DbgData* pData = DbgGetData(); DbgData* pData = DbgGetData();
pData->nTestFlags &= ~(DBG_TEST_XTOR_TRACE | DBG_TEST_MEM_INIT | DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT); pData->nTestFlags &= ~(DBG_TEST_XTOR_TRACE | DBG_TEST_MEM_INIT | DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT);
pData->nTestFlags |= aData.nTestFlags & (DBG_TEST_XTOR_TRACE | DBG_TEST_MEM_INIT | DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT); pData->nTestFlags |= aData.nTestFlags & (DBG_TEST_XTOR_TRACE | DBG_TEST_MEM_INIT | DBG_TEST_RESOURCE | DBG_TEST_DIALOG | DBG_TEST_BOLDAPPFONT);
strcpy( pData->aInclClassFilter, aData.aInclClassFilter ); strncpy( pData->aInclClassFilter, aData.aInclClassFilter, sizeof( pData->aInclClassFilter ) );
strcpy( pData->aExclClassFilter, aData.aExclClassFilter ); strncpy( pData->aExclClassFilter, aData.aExclClassFilter, sizeof( pData->aExclClassFilter ) );
strcpy( pData->aInclFilter, aData.aInclFilter ); strncpy( pData->aInclFilter, aData.aInclFilter, sizeof( pData->aInclFilter ) );
strcpy( pData->aExclFilter, aData.aExclFilter ); strncpy( pData->aExclFilter, aData.aExclFilter, sizeof( pData->aExclFilter ) );
if ( maBoldAppFont.GetSavedValue() != maBoldAppFont.IsChecked() ) if ( maBoldAppFont.GetSavedValue() != maBoldAppFont.IsChecked() )
{ {
AllSettings aSettings = Application::GetSettings(); AllSettings aSettings = Application::GetSettings();