From 70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 22 Nov 2011 09:34:46 +0100 Subject: New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx. * New SAL_INFO..., SAL_WARN... macros. * New SAL_STREAM supersedes OSL_FORMAT. * oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now). * TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site cleanup). * Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet addressed. * Some replacements tools String -> rtl::OUString. --- unotest/inc/unotest/oustringostreaminserter.hxx | 55 ------------------------- unotest/prj/d.lst | 1 - 2 files changed, 56 deletions(-) delete mode 100644 unotest/inc/unotest/oustringostreaminserter.hxx (limited to 'unotest') diff --git a/unotest/inc/unotest/oustringostreaminserter.hxx b/unotest/inc/unotest/oustringostreaminserter.hxx deleted file mode 100644 index 143c3a5c262b..000000000000 --- a/unotest/inc/unotest/oustringostreaminserter.hxx +++ /dev/null @@ -1,55 +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 -* -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX -#define INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX - -#include "sal/config.h" - -#include - -#include "osl/thread.h" -#include "rtl/ustring.hxx" - -// Include this header to support rtl::OUString in CPPUNIT_ASSERT macros. - -namespace rtl { - -template< typename charT, typename traits > std::basic_ostream & -operator <<( - std::basic_ostream & stream, rtl::OUString const & string) -{ - return stream << - rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr(); - // best effort; potentially loses data due to conversion failures and - // embedded null characters -} - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotest/prj/d.lst b/unotest/prj/d.lst index 7b849242f1be..37fbe17f5c79 100644 --- a/unotest/prj/d.lst +++ b/unotest/prj/d.lst @@ -14,7 +14,6 @@ mkdir: %_DEST%\inc\unotest\detail ..\inc\unotest\filters-test.hxx %_DEST%\inc\unotest\filters-test.hxx ..\inc\unotest\gettestargument.hxx %_DEST%\inc\unotest\gettestargument.hxx ..\inc\unotest\officeconnection.hxx %_DEST%\inc\unotest\officeconnection.hxx -..\inc\unotest\oustringostreaminserter.hxx %_DEST%\inc\unotest\oustringostreaminserter.hxx ..\inc\unotest\toabsolutefileurl.hxx %_DEST%\inc\unotest\toabsolutefileurl.hxx ..\inc\unotest\uniquepipename.hxx %_DEST%\inc\unotest\uniquepipename.hxx ..\%__SRC%\class\test.jar %_DEST%\bin\test.jar -- cgit