deprecate oustringostreaminserter.hxx

the intent of this header has canged over time. now it is already
systematically included with ustring.hxx and the operator overload it
provide fit nicely there...

Just to be safe, since that include as been added to the api during the
3.5 timeframe and therefore is already in 'production'
the header remain and simply attempt to include ustring.hxx
but a warning is issued indicating that this header should not be used
anymore... in a couple of major release we will thenr emove it completely

All internal users of that header are converted.

Change-Id: I8934c55f089e29d78c0f5649b7c87b2ecf024bad
Reviewed-on: https://gerrit.libreoffice.org/634
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

5 files changed, 14 insertions, 31 deletions

diff --git a/sal/inc/rtl/oustringostreaminserter.hxx b/sal/inc/rtl/oustringostreaminserter.hxx
index 48dc79e0e097..e29c6378b1ef 100644
--- a/sal/inc/rtl/oustringostreaminserter.hxx
+++ b/sal/inc/rtl/oustringostreaminserter.hxx
@@ -1,34 +1,19 @@
 /* -*- 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.
-************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 
 #ifndef INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
 #define INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
 
-// File kept only for backwards compatibility, the inserter is now defined
-// together with OUString.
+// depreacted header...  include ustring.hxx instead
+#ifndef CPPUNIT_VERSION // protect agaisnt WaE with include all_headers in qa of strings
+#warning "deprecated header, include rtl/ustring.hxx instead"
+#endif
 #include <rtl/ustring.hxx>
 
 #endif
diff --git a/sal/qa/checkapi/strings.cxx b/sal/qa/checkapi/strings.cxx
index f3a1d2f017a2..30758023dbba 100644
--- a/sal/qa/checkapi/strings.cxx
+++ b/sal/qa/checkapi/strings.cxx
@@ -17,10 +17,11 @@
 #error Build system problem, RTL_USING using should not be set here.
 #endif
 
-#include "sal_allheaders.hxx"
-
 // This module contains no tests, this is for the build system.
 #include <cppunit/plugin/TestPlugIn.h>
+
+#include "sal_allheaders.hxx"
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
 {
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index cd9809746690..e02bd93fdd05 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -39,7 +39,6 @@ extern bool rtl_string_unittest_non_const_literal_function;
 #include "rtl/string.h"
 #include "rtl/ustring.hxx"
 #include "rtl/ustrbuf.hxx"
-#include "rtl/oustringostreaminserter.hxx"
 
 namespace test { namespace oustring {
 
diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx
index 1e165e8d9159..5e1b0cfb9c74 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -32,7 +32,6 @@
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
-#include "rtl/oustringostreaminserter.hxx"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/ustring.h"
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 958adbde665a..73215e0f2960 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -36,7 +36,6 @@
 #include <osl/time.h>
 #include <osl/mutex.hxx>
 #include <rtl/bootstrap.h>
-#include <rtl/oustringostreaminserter.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/alloc.h>