diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:06:20 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:06:20 +0100 |
commit | bf70a33a7ad4667bdf073da443134ce36be44273 (patch) | |
tree | 385c3bd066559df0d7459a34e341975f4d6d79a0 | |
parent | 83fd0877caae410af5c063f1bec3a9a8eb713a0b (diff) |
removetooltypes01: #i112600# Fix build problems on non-pro
-rw-r--r-- | soldep/source/depper.cxx | 10 | ||||
-rw-r--r-- | soldep/source/objwin.cxx | 2 | ||||
-rw-r--r-- | soldep/source/soldep.cxx | 6 | ||||
-rw-r--r-- | solenv/bin/dbgsv.ini | 70 |
4 files changed, 51 insertions, 37 deletions
diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx index 740558cde9a3..d34a93222a3f 100644 --- a/soldep/source/depper.cxx +++ b/soldep/source/depper.cxx @@ -152,7 +152,7 @@ void Depper::RemoveAllObjects( ObjectList* pObjLst ) sal_uInt16 Depper::Save( const ByteString& rFileName ) { - DBG_ASSERT( FALSE , "you are dead!" ); + DBG_ASSERT( sal_False , "you are dead!" ); SvFileStream aOutFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_WRITE ); depper_head dh; sal_uInt16 i; @@ -183,19 +183,19 @@ sal_uInt16 Depper::Save( const ByteString& rFileName ) sal_uInt16 Depper::WriteSource() { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; sal_uInt16 Depper::ReadSource( sal_Bool bUpdater ) { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; sal_uInt16 Depper::OpenSource() { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; @@ -680,7 +680,7 @@ IMPL_LINK( Depper, PopupSelected, PopupMenu*, mpPopup ) maToolBox.Show(); break; default : - DBG_ASSERT( FALSE, "default" ); + DBG_ASSERT( sal_False, "default" ); break; } return 0; diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx index 4ba34956c59f..f87101254a96 100644 --- a/soldep/source/objwin.cxx +++ b/soldep/source/objwin.cxx @@ -659,7 +659,7 @@ IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) switch( nItemId ) { case OBJWIN_EDIT_TEXT : - DBG_ASSERT( FALSE,"edit"); + DBG_ASSERT( sal_False,"edit"); break; case OBJWIN_REMOVE_WIN : // DBG_ASSERT( FALSE,"remove"); diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index 71edfb97370f..2ab3afefd92c 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -379,7 +379,7 @@ ObjectWin *SolDep::RemoveObject( sal_uInt16 nId, sal_Bool bDelete ) delete pPrj; } else - DBG_ASSERT( FALSE, "project not found - write" ); + DBG_ASSERT( sal_False, "project not found - write" ); mpSolIdMapper->Delete( aBodyText ); if ( bDelete ) @@ -446,7 +446,7 @@ sal_uInt16 SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) } else { - DBG_ASSERT( FALSE , "non existing Project" ); + DBG_ASSERT( sal_False , "non existing Project" ); return 1; } } @@ -699,7 +699,7 @@ sal_uInt16 SolDep::WriteSource() sal_uInt16 SolDep::Load( const ByteString& rFileName ) { // moved from depper class - DBG_ASSERT( FALSE , "you are dead!" ); + DBG_ASSERT( sal_False , "you are dead!" ); SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ ); depper_head dh; sal_uIntPtr i; diff --git a/solenv/bin/dbgsv.ini b/solenv/bin/dbgsv.ini index 006dadf98a40..85f2e661f99d 100644 --- a/solenv/bin/dbgsv.ini +++ b/solenv/bin/dbgsv.ini @@ -1,29 +1,43 @@ -=************************************************************************* -= -= DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -= -= Copyright 2000, 2010 Oracle and/or its affiliates. -= -= OpenOffice.org - a multi-platform office productivity suite -= -= This file is part of OpenOffice.org. -= -= OpenOffice.org is free software: you can redistribute it and/or modify -= it under the terms of the GNU Lesser General Public License version 3 -= only, as published by the Free Software Foundation. -= -= OpenOffice.org is distributed in the hope that it will be useful, -= but WITHOUT ANY WARRANTY; without even the implied warranty of -= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -= GNU Lesser General Public License version 3 for more details -= (a copy is included in the LICENSE file that accompanied this code). -= -= You should have received a copy of the GNU Lesser General Public License -= version 3 along with OpenOffice.org. If not, see -= <http://www.openoffice.org/license.html> -= for a copy of the LGPLv3 License. -= -=***********************************************************************/ - [output] -error=shell +log_file=dbgsv.log +overwrite=1 +include= +exclude= +include_class= +exclude_class= +trace=dev/null +warning=messagebox +error=messagebox +oslhook=1 + +[memory] +initialize=1 +overwrite=0 +overwrite_free=0 +pointer=0 +report=0 +trace=0 +new_and_delete=0 +object_test=0 +sys_alloc=0 +leak_report=0 + +init_byte=77 +bound_byte=55 +free_byte=33 + +[gui] +debug_window_state= + +[objects] +check_this=0 +check_function=0 +check_exit=0 +generate_report=0 +trace=0 + +[test] +profiling=0 +resources=1 +dialog=0 +bold_app_font=0 |