summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.cxx3
-rw-r--r--basic/source/sbx/sbxbase.cxx3
-rw-r--r--basic/source/uno/namecont.cxx3
-rw-r--r--binaryurp/source/bridge.cxx1
-rw-r--r--binaryurp/source/reader.cxx3
-rw-r--r--chart2/source/view/main/ChartView.cxx2
-rw-r--r--comphelper/source/misc/configuration.cxx3
-rw-r--r--configmgr/source/components.cxx1
-rw-r--r--configmgr/source/data.cxx1
-rw-r--r--configmgr/source/writemodfile.cxx1
-rw-r--r--configmgr/source/xcuparser.cxx1
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx2
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx2
-rw-r--r--cppu/qa/test_unotype.cxx3
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx1
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx3
-rw-r--r--drawinglayer/source/dumper/XShapeDumper.cxx2
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h3
-rw-r--r--l10ntools/source/localize.cxx1
-rw-r--r--oox/source/mathml/importutils.cxx3
-rw-r--r--oox/source/vml/vmldrawing.cxx2
-rw-r--r--oox/source/vml/vmlshape.cxx1
-rw-r--r--sal/inc/rtl/oustringostreaminserter.hxx37
-rw-r--r--sal/qa/checkapi/strings.cxx5
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx1
-rw-r--r--sal/qa/rtl/strings/test_strings_replace.cxx1
-rw-r--r--sal/rtl/source/logfile.cxx1
-rw-r--r--sc/qa/extras/regression-test.cxx1
-rw-r--r--sd/qa/unit/regression-test.cxx1
-rw-r--r--sdext/source/pdfimport/test/tests.cxx2
-rw-r--r--sfx2/source/bastyp/helper.cxx1
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx1
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx1
-rw-r--r--smoketest/smoketest.cxx1
-rw-r--r--starmath/source/ooxmlexport.cxx2
-rw-r--r--starmath/source/ooxmlimport.cxx2
-rw-r--r--starmath/source/rtfexport.cxx2
-rw-r--r--starmath/source/wordexportbase.cxx2
-rw-r--r--svl/source/config/asiancfg.cxx1
-rw-r--r--svtools/source/contnr/DocumentInfoPreview.cxx2
-rw-r--r--svtools/source/control/calendar.cxx1
-rw-r--r--svx/source/svdraw/svdmodel.cxx1
-rw-r--r--svx/source/svdraw/svdomedia.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx1
-rw-r--r--sw/qa/extras/regression-test.cxx1
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx2
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx1
-rw-r--r--test/source/sheet/datapilotfield.cxx2
-rw-r--r--test/source/sheet/xdatabaserange.cxx2
-rw-r--r--test/source/sheet/xdatapilotdescriptor.cxx2
-rw-r--r--test/source/sheet/xdatapilottable.cxx2
-rw-r--r--test/source/sheet/xnamedrange.cxx2
-rw-r--r--test/source/sheet/xnamedranges.cxx2
-rw-r--r--test/source/sheet/xprintareas.cxx2
-rw-r--r--test/source/sheet/xspreadsheets2.cxx2
-rw-r--r--tools/qa/cppunit/test_reversemap.cxx1
-rw-r--r--tools/source/rc/resmgr.cxx1
-rw-r--r--unotools/source/i18n/instance.hxx1
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx1
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx1
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx1
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx2
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx2
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx2
-rw-r--r--xmloff/source/draw/shapeexport2.cxx1
-rw-r--r--xmlreader/source/xmlreader.cxx1
80 files changed, 57 insertions, 119 deletions
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index daf26ad10ccb..ef2995c6466c 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -30,8 +30,7 @@
#include <avmedia/mediaitem.hxx>
#include "mediamisc.hxx"
#include "mediawindow.hrc"
-#include <rtl/oustringostreaminserter.hxx>
-#include <sal/log.hxx>
+#include <rtl/ustring.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 0b10ffa7159c..e56172275a04 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -25,8 +25,7 @@
#include <basic/sbxbase.hxx>
#include <rtl/instance.hxx>
-#include <rtl/oustringostreaminserter.hxx>
-#include <sal/log.hxx>
+#include <rtl/ustring.hxx>
#include <boost/foreach.hpp>
// AppData-Structure for SBX:
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index e09c84f7c784..dc72b38d83b6 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -25,10 +25,9 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <tools/errinf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <rtl/uri.hxx>
#include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/anytostring.hxx>
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index e59311ddb12e..5256ac081663 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -45,7 +45,6 @@
#include "osl/mutex.hxx"
#include "osl/thread.hxx"
#include "rtl/byteseq.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/random.h"
#include "rtl/ref.hxx"
#include "rtl/ustrbuf.hxx"
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 353c07e29722..cbfb7dd42d3c 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -37,10 +37,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
#include "rtl/byteseq.h"
-#include "rtl/oustringostreaminserter.hxx"
-#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
-#include "sal/log.hxx"
#include "sal/types.h"
#include "typelib/typeclass.h"
#include "typelib/typedescription.h"
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index e9cd734032a8..86a6e5648e1e 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -103,7 +103,7 @@
#include <sot/clsids.hxx>
#include <rtl/strbuf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
//.............................................................................
namespace chart
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 01ec08fd515a..dd5e6ca14fc1 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -47,11 +47,8 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "comphelper/configuration.hxx"
#include "rtl/instance.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
-#include "sal/log.hxx"
namespace {
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index c08744e99a8e..2a0bffc31b82 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -40,7 +40,6 @@
#include "osl/mutex.hxx"
#include "rtl/bootstrap.hxx"
#include "rtl/logfile.h"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ref.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index d93a262ba5fd..d7d77555c630 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -25,7 +25,6 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ref.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 67ab59498712..7e69cd9e5d64 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -29,7 +29,6 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "osl/file.h"
#include "osl/file.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/textcvt.h"
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e2531cfcc1ee..496774762035 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -26,7 +26,6 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ref.hxx"
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 01b0e68f343a..5d1140f72673 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -28,7 +28,7 @@
#include <connectivity/dbexception.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace connectivity::evoab;
using namespace dbtools;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 7bf00160321b..711f09e8c150 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <osl/diagnose.h>
#include <osl/thread.h>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/FetchDirection.hpp>
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index f1e9c863540d..5c57a641df4b 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -360,8 +360,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#include "rtl/oustringostreaminserter.hxx"
-#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include <cstddef>
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 0b370d754ea6..60921c899d3b 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -39,10 +39,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
-#include "rtl/oustringostreaminserter.hxx"
-#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
-#include "sal/types.h"
namespace com { namespace sun { namespace star { namespace uno {
class Any;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index ae34f2e67b91..894999efe105 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -32,7 +32,6 @@
#include "dp_platform.hxx"
#include "dp_manager.h"
#include "dp_identifier.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/string.hxx"
#include "rtl/uri.hxx"
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 023430c72764..57703d5d3986 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -29,10 +29,9 @@
#include "dp_backend.h"
#include "dp_ucb.h"
-#include "rtl/oustringostreaminserter.hxx"
+#include "rtl/ustring.hxx"
#include "rtl/uri.hxx"
#include "rtl/bootstrap.hxx"
-#include "sal/log.hxx"
#include "osl/file.hxx"
#include "cppuhelper/exc_hlp.hxx"
#include "comphelper/servicedecl.hxx"
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx
index f21157544925..41ae941cd75c 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -36,7 +36,7 @@
#include <rtl/strbuf.hxx>
#include <libxml/xmlwriter.h>
#include <iostream>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#define DEBUG_DUMPER 0
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 4a50aa9d8b98..d1c68387aef3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -139,7 +139,7 @@
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx"
#include <rtl/strbuf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <boost/scoped_array.hpp>
using namespace ::com::sun::star ;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index e1194e418ac8..d18e815c45c9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -22,8 +22,7 @@
#include "sal/config.h"
-#include "rtl/oustringostreaminserter.hxx"
-#include "sal/log.hxx"
+#include "rtl/ustring.hxx"
#define JFW_ENSURE(c, m) SAL_WARN_IF(!(c), "jfw", m)
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index a54d096503df..eaf9a135c796 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -39,7 +39,6 @@
#include "osl/file.hxx"
#include "osl/process.h"
#include "osl/thread.h"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/textcvt.h"
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index 01c2ba7cee3a..99b673dbb6a4 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -35,8 +35,7 @@
#include <oox/token/tokenmap.hxx>
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
-#include <rtl/oustringostreaminserter.hxx>
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
// *sigh*
#define STR( str ) OUString( RTL_CONSTASCII_USTRINGPARAM( str ))
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 10c21829b09d..58eb29b15138 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/ole/axcontrol.hxx"
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 759947ac0fd3..156730f67d01 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/text/TextContentAnchorType.hpp>
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/helper/propertyset.hxx"
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>
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index e909467ffecf..d41755fbc51f 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -33,7 +33,6 @@
#include <unotest/macros_test.hxx>
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfilt.hxx>
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index 38d56358e19b..266f538b035d 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -55,7 +55,6 @@
#include <string>
#include <iostream>
-#include <rtl/oustringostreaminserter.hxx>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <drawinglayer/XShapeDumper.hxx>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 4be6541e7fc5..e6f3f29ffad8 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -77,7 +77,7 @@
#include <boost/unordered_map.hpp>
#include <cassert>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace ::pdfparse;
using namespace ::pdfi;
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 2a01bf3f432b..a2656b7dc62b 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <unotools/localedatawrapper.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <tools/debug.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 0b8e2108335b..fe034f0b0d48 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/embed/VerbAttributes.hpp>
#include <basic/sbstar.hxx>
#include <officecfg/Office/Common.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <svl/itempool.hxx>
#include <svl/undo.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b1ea8be470ae..5b2149365060 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -91,7 +91,6 @@
#include "filedlgimpl.hxx"
#include <helpid.hrc>
#include <sfxlocal.hrc>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#ifdef UNX
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index ce73733fa3e3..a168d94dea26 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -24,7 +24,6 @@
#include <sfx2/docfac.hxx>
#include "sfx2/sfxresid.hxx"
#include <osl/thread.h>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/beans/StringPair.hpp>
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index ab521c10f29d..67257ea0fba8 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -46,7 +46,6 @@
#include "osl/conditn.hxx"
#include "osl/diagnose.h"
#include "osl/time.h"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "unotest/gettestargument.hxx"
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 9cf7188543a7..f9b716237461 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -30,7 +30,7 @@
#include "ooxmlexport.hxx"
#include <oox/token/tokens.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace oox;
using namespace oox::core;
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 50b06e022fe5..c83fc9b26209 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -31,7 +31,7 @@
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace oox;
using namespace oox::formulaimport;
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 6f4d0a20d515..7e37ac39de76 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -29,7 +29,7 @@
#include "rtfexport.hxx"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <svtools/rtfkeywd.hxx>
#include <filter/msfilter/rtfutil.hxx>
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx
index 9f5e54bd182f..3181697edf9f 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -29,7 +29,7 @@
#include "wordexportbase.hxx"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
SmWordExportBase::SmWordExportBase( const SmNode* pIn )
: m_pTree( pIn )
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 3d51c751e44f..810b1c163c3c 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -35,7 +35,6 @@
#include "comphelper/configuration.hxx"
#include "comphelper/processfactory.hxx"
#include "officecfg/Office/Common.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 3f3f15a8cce9..0b6ad20c74ff 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -34,7 +34,7 @@
#include "com/sun/star/script/XTypeConverter.hpp"
#include "comphelper/processfactory.hxx"
#include "comphelper/string.hxx"
-#include "rtl/oustringostreaminserter.hxx"
+#include "rtl/ustring.hxx"
#include "svl/inettype.hxx"
#include "svtools/DocumentInfoPreview.hxx"
#include "svtools/imagemgr.hxx"
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 9c41a8b486af..c985e6406767 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -27,7 +27,6 @@
************************************************************************/
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9938a1f286b1..8bcb27df0fbb 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -34,7 +34,6 @@
#include <osl/endian.h>
#include <rtl/logfile.hxx>
#include <rtl/strbuf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 89ce42f4d540..ef6194846334 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -29,7 +29,7 @@
#include <svx/svdomedia.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <osl/file.hxx>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index bd4954a6d348..215c8fe88e86 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -28,7 +28,6 @@
#include <comphelper/string.hxx>
#include <sal/macros.h>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/sw/qa/extras/regression-test.cxx b/sw/qa/extras/regression-test.cxx
index 589f12be27dc..910d4867c9a6 100644
--- a/sw/qa/extras/regression-test.cxx
+++ b/sw/qa/extras/regression-test.cxx
@@ -46,7 +46,6 @@
#include <string>
#include <iostream>
-#include <rtl/oustringostreaminserter.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 918e7a54815a..ac4169305ee3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index c3f3aef1b91d..20bbfe202a2e 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -52,7 +52,7 @@
#include <editsh.hxx>
#include <pam.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index d3ca9b571f4c..fe5d8523a75a 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <sot/stg.hxx>
#include <sfx2/docfile.hxx>
#include <tools/urlobj.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 15f15b719e41..38b32fa96f89 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -38,7 +38,7 @@
#include "fmtcntnt.hxx"
#include "fchrfmt.hxx"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <svtools/rtfkeywd.hxx>
#include <editeng/fontitem.hxx>
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index c14c5aabdc28..4ae68d2be8f0 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -62,7 +62,7 @@
#include "ww8par.hxx"
#include <comphelper/string.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <svtools/rtfkeywd.hxx>
#include <filter/msfilter/rtfutil.hxx>
#include <unotools/configmgr.hxx>
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 66273f9f95a6..0305d3160097 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
#include <cppuhelper/implbase1.hxx>
#include <officecfg/Office/Common.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <vcl/textview.hxx>
diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index 747abf38c019..5f3ccdc6867b 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "cppunit/extensions/HelperMacros.h"
#include <iostream>
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index d8cb3a072afa..f57e3d37fcdd 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/table/XTableRows.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "cppunit/extensions/HelperMacros.h"
#include <iostream>
diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx
index 3f6346d33e2b..d6bb683511a3 100644
--- a/test/source/sheet/xdatapilotdescriptor.cxx
+++ b/test/source/sheet/xdatapilotdescriptor.cxx
@@ -35,7 +35,7 @@
#include "cppunit/extensions/HelperMacros.h"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xdatapilottable.cxx b/test/source/sheet/xdatapilottable.cxx
index 5cb8849d5b01..a24eddd493d7 100644
--- a/test/source/sheet/xdatapilottable.cxx
+++ b/test/source/sheet/xdatapilottable.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx
index 1c910852e4be..8330c1e7ef9d 100644
--- a/test/source/sheet/xnamedrange.cxx
+++ b/test/source/sheet/xnamedrange.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include "cppunit/extensions/HelperMacros.h"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index 9f52cc678f38..4fd7e9f124b8 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/sheet/Border.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "cppunit/extensions/HelperMacros.h"
#include <iostream>
diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx
index 407aed99b588..6a993095b44c 100644
--- a/test/source/sheet/xprintareas.cxx
+++ b/test/source/sheet/xprintareas.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/sheet/XPrintAreas.hpp>
#include "cppunit/extensions/HelperMacros.h"
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 13dea7d5218f..5a38a35c0d08 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -50,7 +50,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/table/CellVertJustify.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "cppunit/extensions/HelperMacros.h"
using namespace com::sun::star::uno;
diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index d7d990cc1056..af232c0bcb1e 100644
--- a/tools/qa/cppunit/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -31,7 +31,6 @@
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
-#include "rtl/oustringostreaminserter.hxx"
#include <rtl/ustring.hxx>
#include <vector>
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index cf51100ecbc7..8ba791a9a948 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -32,7 +32,6 @@
#include <osl/file.hxx>
#include <osl/mutex.hxx>
#include <osl/signal.h>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx
index 6a1a069ab476..e0378af36a59 100644
--- a/unotools/source/i18n/instance.hxx
+++ b/unotools/source/i18n/instance.hxx
@@ -30,7 +30,6 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
namespace css = ::com::sun::star;
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 39e0835f6a19..1b6902eceb82 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -46,7 +46,6 @@
#include "comphelper/processfactory.hxx"
#include "cppuhelper/exc_hlp.hxx"
#include "osl/file.hxx"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 0a76b1c6f78f..e51c552d619d 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -60,7 +60,7 @@
#include <officecfg/Office/Common.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 0f91201eeccf..0736d692e734 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -58,7 +58,7 @@
#include <comphelper/types.hxx>
#include <comphelper/storagehelper.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <CellColorHandler.hxx>
#include <SectionColumnHandler.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index e0d831680d4a..fbdabd982bc4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -28,7 +28,7 @@
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
#include <PropertyMapHelper.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#endif
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1745f7d28f33..e144f6e9b7e4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -70,7 +70,6 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/string.h>
-#include <rtl/oustringostreaminserter.hxx>
#include "FieldTypes.hxx"
#include <oox/mathml/import.hxx>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index fb0d6fa4cd51..48cdf6cdb790 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -41,7 +41,6 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <dmapper/DomainMapper.hxx>
#include <doctok/resourceids.hxx>
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 0d8750e8525b..b69fd2fb4328 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -18,7 +18,7 @@
*/
#include <ModelEventListener.hxx>
#include <PropertyIds.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/text/XDocumentIndex.hpp>
#include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 335f2f4288ca..23b72259873b 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/text/PositionAndSpaceMode.hpp>
#include <com/sun/star/text/XChapterNumberingSupplier.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include "dmapperLoggers.hxx"
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 84663e3e5e7e..ae4490f30cc3 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -22,7 +22,7 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 669b5cb5a608..fcb7572bc4d8 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -21,7 +21,7 @@
#include <DomainMapper_Impl.hxx>
#include <ConversionHelper.hxx>
#include <i18nutil/paper.hxx>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 28c382357e00..b071449f1b1b 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <osl/module.hxx>
#include <tools/solar.h>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bd72dd6f4e13..282f68a881ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -41,7 +41,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/graph.hxx>
#include <svtools/grfmgr.hxx>
#include <vcl/svapp.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 2d1a7f84b987..7129b8407659 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -52,7 +52,7 @@
#pragma warning(pop)
#endif
-#include <rtl/oustringostreaminserter.hxx>
+#include <rtl/ustring.hxx>
#include <algorithm>
#include <set>
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 8d04c9d3ce2b..06149952dde9 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
-#include <rtl/oustringostreaminserter.hxx>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 0d2b7251f1b4..fcf6e157a246 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -28,7 +28,6 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "osl/file.h"
-#include "rtl/oustringostreaminserter.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"