deduplicate OString std::basic_ostream operators
I wanted to add one, based on OUString one, and Stephan on IRC agreed it's a good idea. Then it turned out we already had it in sal unit tests, sdext and unodevtools as well. Get rid of all these, and have a single implementation in string.hxx, so it can be used everywhere. Change-Id: Ibb820f20a138d055fd87036253c627fb862a31fe
This commit is contained in:
Miklos Vajna
parent
7f97d31407
commit
26364f4fd3
10 changed files with 14 additions and 77 deletions
|
|
@ -1479,6 +1479,20 @@ struct OStringHash
|
|||
|
||||
/* ======================================================================= */
|
||||
|
||||
/**
|
||||
Support for rtl::OString in std::ostream (and thus in
|
||||
CPPUNIT_ASSERT or SAL_INFO macros, for example).
|
||||
|
||||
@since LibreOffice 3.7
|
||||
*/
|
||||
template< typename charT, typename traits > std::basic_ostream<charT, traits> &
|
||||
operator <<(
|
||||
std::basic_ostream<charT, traits> & stream, rtl::OString const & string)
|
||||
{
|
||||
return stream << string.getStr();
|
||||
// best effort; potentially loses data due to embedded null characters
|
||||
}
|
||||
|
||||
} /* Namespace */
|
||||
|
||||
#ifdef RTL_USING
|
||||
|
|
|
|||
|
|
@ -37,18 +37,6 @@
|
|||
#include "rtl/ustring.h"
|
||||
#include "rtl/ustring.hxx"
|
||||
|
||||
namespace rtl {
|
||||
|
||||
template< typename charT, typename traits > std::basic_ostream<charT, traits> &
|
||||
operator <<(
|
||||
std::basic_ostream<charT, traits> & stream, rtl::OString const & string)
|
||||
{
|
||||
return stream << string.getStr();
|
||||
// best effort; potentially loses data due to embedded null characters
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
class Test: public CppUnit::TestFixture {
|
||||
|
|
|
|||
|
|
@ -72,16 +72,6 @@ using namespace ::pdfparse;
|
|||
using namespace ::pdfi;
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
namespace rtl
|
||||
{
|
||||
template< typename charT, typename traits > std::basic_ostream<charT, traits> &
|
||||
operator <<(
|
||||
std::basic_ostream<charT, traits> & stream, rtl::OString const & string)
|
||||
{
|
||||
return stream << string.getStr();
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
#include "codemaker/commoncpp.hxx"
|
||||
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletoncommon.hxx"
|
||||
#include "skeletoncpp.hxx"
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
#include "codemaker/commoncpp.hxx"
|
||||
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletoncommon.hxx"
|
||||
#include "skeletoncpp.hxx"
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
#include "codemaker/commonjava.hxx"
|
||||
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletoncommon.hxx"
|
||||
#include "skeletonjava.hxx"
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
#include "codemaker/commonjava.hxx"
|
||||
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletoncommon.hxx"
|
||||
#include "skeletonjava.hxx"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License or as specified alternatively below. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* Major Contributor(s):
|
||||
* Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
|
||||
* (initial developer) ]
|
||||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* For minor contributions see the git repository.
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
||||
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
||||
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
||||
* instead of those above.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_OSTRINGOSTREAMINSERTER_HXX
|
||||
#define INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_OSTRINGOSTREAMINSERTER_HXX
|
||||
|
||||
#include "sal/config.h"
|
||||
|
||||
#include <ostream>
|
||||
|
||||
#include "rtl/string.hxx"
|
||||
|
||||
template< typename charT, typename traits > std::basic_ostream<charT, traits> &
|
||||
operator <<(
|
||||
std::basic_ostream<charT, traits> & stream, rtl::OString const & string)
|
||||
{
|
||||
return stream << string.getStr();
|
||||
// potentially loses data due to embedded null characters
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
#include "codemaker/commoncpp.hxx"
|
||||
#include "codemaker/generatedtypeset.hxx"
|
||||
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletoncommon.hxx"
|
||||
|
||||
#include <iostream>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include "rtl/ustrbuf.hxx"
|
||||
#include "unodevtools/typemanager.hxx"
|
||||
#include "unodevtools/options.hxx"
|
||||
#include "ostringostreaminserter.hxx"
|
||||
#include "skeletonjava.hxx"
|
||||
#include "skeletoncpp.hxx"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue