summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-24 09:51:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-24 15:29:52 +0000
commit89f057a09d8684f697a822662907cfede7ef0a3f (patch)
tree86ee58acdc9bc88a8d92826ec8582b046a910653
parent56d168cc59a352ec432e09b8ba471b858387023c (diff)
ditch dbg_dump
-rw-r--r--avmedia/source/quicktime/player.cxx31
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx31
-rw-r--r--sal/rtl/source/debugprint.cxx67
-rw-r--r--sal/rtl/source/makefile.mk33
-rw-r--r--sc/source/core/tool/compiler.cxx27
-rw-r--r--tools/Library_tl.mk3
-rw-r--r--tools/source/string/debugprint.cxx48
7 files changed, 0 insertions, 240 deletions
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index f7efb51b8471..e4550a0f8d28 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -32,37 +32,6 @@
#include "framegrabber.hxx"
#include "window.hxx"
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL > 1
-#include <rtl/strbuf.hxx>
-#include <rtl/ustring.hxx>
-
-const sal_Char *dbg_dump(const rtl::OString &rStr)
-{
- static rtl::OStringBuffer aStr;
-
- aStr = rtl::OStringBuffer(rStr);
- aStr.append(static_cast<char>(0));
- return aStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OUString &rStr)
-{
- return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
- return dbg_dump(rtl::OString(pStr));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
- return dbg_dump(rtl::OUString(pStr));
-}
-
-#endif
-
using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 336b37363514..3f7cc2d8ba17 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -61,37 +61,6 @@ using ::rtl::OUStringBuffer;
using ::rtl::OUStringToOString;
///////////////////////////////////////////////////////////////////////////
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL > 1
-#include <rtl/strbuf.hxx>
-#include <rtl/ustring.hxx>
-
-const sal_Char *dbg_dump(const rtl::OString &rStr)
-{
- static rtl::OStringBuffer aStr;
-
- aStr = rtl::OStringBuffer(rStr);
- aStr.append(static_cast<char>(0));
- return aStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OUString &rStr)
-{
- return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
- return dbg_dump(rtl::OString(pStr));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
- return dbg_dump(rtl::OUString(pStr));
-}
-
-#endif
-///////////////////////////////////////////////////////////////////////////
MacSpellChecker::MacSpellChecker() :
aEvtListeners ( GetLinguMutex() )
diff --git a/sal/rtl/source/debugprint.cxx b/sal/rtl/source/debugprint.cxx
deleted file mode 100644
index 079643b07fd4..000000000000
--- a/sal/rtl/source/debugprint.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-
-const sal_Char *dbg_dump(const rtl::OString &rStr)
-{
- return rStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OStringBuffer &rStrBuf)
-{
- return rStrBuf.getStr();
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
- return rtl_string_getStr(pStr);
-}
-
-const sal_Char *dbg_dump(const rtl::OUString &rStr)
-{
- return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(const rtl::OUStringBuffer &rStrBuf)
-{
- return dbg_dump(rtl::OUString(rStrBuf.getStr()));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
- return dbg_dump(rtl::OUString(pStr));
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index ff8ee9142e5b..60953f84b919 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -58,14 +58,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(header)" == ""
-.IF "$(OS)" != "AIX"
-ALWAYSDBGFILES=$(SLO)$/debugprint.obj
-.ENDIF
-
-.IF "$(ALWAYSDBGFILES)" != ""
-ALWAYSDBGTARGET=do_it_alwaysdebug
-.ENDIF
-
SLOFILES= \
$(SLO)$/memory.obj \
$(SLO)$/cipher.obj \
@@ -87,7 +79,6 @@ SLOFILES= \
$(SLO)$/cmdargs.obj \
$(SLO)$/unload.obj \
$(SLO)$/logfile.obj \
- $(SLO)$/debugprint.obj \
$(SLO)$/math.obj \
$(SLO)$/alloc_global.obj\
$(SLO)$/alloc_cache.obj \
@@ -121,7 +112,6 @@ OBJFILES= \
$(OBJ)$/alloc_arena.obj \
$(OBJ)$/alloc_fini.obj
-
.ENDIF
# --- Makefile snippet --------------------------------------------
@@ -131,31 +121,8 @@ BOOTSTRAPMK = $(OUT)$/inc$/rtlbootstrap.mk
# --- Targets ------------------------------------------------------
-.IF "$(ALWAYSDBG_FLAG)"==""
-TARGETDEPS+=$(ALWAYSDBGTARGET)
-.ENDIF
-
.INCLUDE : target.mk
-.IF "$(ALWAYSDBGTARGET)" != ""
-.IF "$(ALWAYSDBG_FLAG)" == ""
-# --------------------------------------------------
-# - ALWAYSDBG - files always compiled with debugging
-# --------------------------------------------------
-$(ALWAYSDBGTARGET):
- @echo --- ALWAYSDBGFILES ---
- @dmake $(MFLAGS) $(MAKEFILE) debug=true $(ALWAYSDBGFILES) ALWAYSDBG_FLAG=TRUE $(CALLMACROS)
- @echo --- ALWAYSDBGFILES OVER ---
-
-$(ALWAYSDBGFILES):
- @echo --- ALWAYSDBG ---
- @dmake $(MFLAGS) $(MAKEFILE) debug=true ALWAYSDBG_FLAG=TRUE $(CALLMACROS) $@
- @echo --- ALWAYSDBG OVER ---
-
-.ENDIF
-.ENDIF
-
-
ALLTAR : $(BOOTSTRAPMK)
$(BOOTSTRAPMK) :
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1a484ef65bf4..e6aa49a25acd 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -82,33 +82,6 @@ using namespace ::com::sun::star;
using rtl::OUString;
using ::std::vector;
-#if OSL_DEBUG_LEVEL > 1
-// For some unknown reason the identical dbg_dump utilities in
-// tools/source/string/debugprint.cxx tend to crash when called from within
-// gdb. Having them here also comes handy as libtl*.so doesn't have to be
-// replaced.
-const char* dbg_sc_dump( const ByteString & rStr )
-{
- static ByteString aStr;
- aStr = rStr;
- aStr.Append(static_cast<char>(0));
- return aStr.GetBuffer();
-}
-const char* dbg_sc_dump( const UniString & rStr )
-{
- return dbg_sc_dump(ByteString(rStr, RTL_TEXTENCODING_UTF8));
-}
-const char* dbg_sc_dump( const sal_Unicode * pBuf )
-{
- return dbg_sc_dump( UniString( pBuf));
-}
-const char* dbg_sc_dump( const sal_Unicode c )
-{
- return dbg_sc_dump( UniString( c));
-}
-#endif
-
-
CharClass* ScCompiler::pCharClassEnglish = NULL;
const ScCompiler::Convention* ScCompiler::pConventions[ ] = { NULL, NULL, NULL, NULL, NULL, NULL };
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 64657b52186d..57beb90686d6 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/stream/stream \
tools/source/stream/strmsys \
tools/source/stream/vcompat \
- tools/source/string/debugprint \
tools/source/string/tenccvt \
tools/source/string/tstring \
tools/source/string/tustring \
@@ -149,8 +148,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
endif
-# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
-# -DOPTIMIZE
# no -DTOOLS_DLLIMPLEMENTATION on toolsdll
# -DEXCEPTIONS_OFF -fno-exceptions on datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
# vim: set noet sw=4 ts=4:
diff --git a/tools/source/string/debugprint.cxx b/tools/source/string/debugprint.cxx
deleted file mode 100644
index 85133319f4e1..000000000000
--- a/tools/source/string/debugprint.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_tools.hxx"
-
-// =======================================================================
-
-#include <tools/string.hxx>
-
-const sal_Char *dbg_dump(const ByteString &rStr)
-{
- static ByteString aStr;
- aStr = rStr;
- return aStr.GetBuffer();
-}
-
-const sal_Char *dbg_dump(const UniString &rStr)
-{
- return dbg_dump(ByteString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */