[Libreoffice-commits] .: avmedia/source basic/source binaryurp/source chart2/source comphelper/source configmgr/source connectivity/source cppu/qa desktop/source drawinglayer/source filter/source jvmfwk/plugins l10ntools/source oox/source sal/inc sal/qa sal/rtl sc/qa sdext/source sd/qa sfx2/source smoketest/smoketest.cxx starmath/source svl/source svtools/source svx/source sw/qa sw/source test/source tools/qa tools/source unotools/source vcl/unx writerfilter/source xmlhelp/source xmloff/source xmlreader/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 18 03:10:38 PDT 2012 

 avmedia/source/viewer/mediawindowbase_impl.cxx           |    3 -
 basic/source/sbx/sbxbase.cxx                             |    3 -
 basic/source/uno/namecont.cxx                            |    3 -
 binaryurp/source/bridge.cxx                              |    1 
 binaryurp/source/reader.cxx                              |    3 -
 chart2/source/view/main/ChartView.cxx                    |    2 
 comphelper/source/misc/configuration.cxx                 |    3 -
 configmgr/source/components.cxx                          |    1 
 configmgr/source/data.cxx                                |    1 
 configmgr/source/writemodfile.cxx                        |    1 
 configmgr/source/xcuparser.cxx                           |    1 
 connectivity/source/drivers/evoab2/NConnection.cxx       |    2 
 connectivity/source/drivers/evoab2/NStatement.cxx        |    2 
 cppu/qa/cppumaker/test_cppumaker.cxx                     |    2 
 cppu/qa/test_unotype.cxx                                 |    3 -
 desktop/source/deployment/manager/dp_manager.cxx         |    1 
 desktop/source/deployment/registry/dp_backend.cxx        |    3 -
 drawinglayer/source/dumper/XShapeDumper.cxx              |    2 
 filter/source/msfilter/msdffimp.cxx                      |    2 
 jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h          |    3 -
 l10ntools/source/localize.cxx                            |    1 
 oox/source/mathml/importutils.cxx                        |    3 -
 oox/source/vml/vmldrawing.cxx                            |    2 
 oox/source/vml/vmlshape.cxx                              |    1 
 sal/inc/rtl/oustringostreaminserter.hxx                  |   37 ++++-----------
 sal/qa/checkapi/strings.cxx                              |    5 +-
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx      |    1 
 sal/qa/rtl/strings/test_strings_replace.cxx              |    1 
 sal/rtl/source/logfile.cxx                               |    1 
 sc/qa/extras/regression-test.cxx                         |    1 
 sd/qa/unit/regression-test.cxx                           |    1 
 sdext/source/pdfimport/test/tests.cxx                    |    2 
 sfx2/source/bastyp/helper.cxx                            |    1 
 sfx2/source/control/shell.cxx                            |    2 
 sfx2/source/dialog/filedlghelper.cxx                     |    1 
 sfx2/source/dialog/filtergrouping.cxx                    |    1 
 smoketest/smoketest.cxx                                  |    1 
 starmath/source/ooxmlexport.cxx                          |    2 
 starmath/source/ooxmlimport.cxx                          |    2 
 starmath/source/rtfexport.cxx                            |    2 
 starmath/source/wordexportbase.cxx                       |    2 
 svl/source/config/asiancfg.cxx                           |    1 
 svtools/source/contnr/DocumentInfoPreview.cxx            |    2 
 svtools/source/control/calendar.cxx                      |    1 
 svx/source/svdraw/svdmodel.cxx                           |    1 
 svx/source/svdraw/svdomedia.cxx                          |    2 
 svx/source/xml/xmlgrhlp.cxx                              |    1 
 sw/qa/extras/regression-test.cxx                         |    1 
 sw/qa/extras/rtfimport/rtfimport.cxx                     |    2 
 sw/source/core/graphic/ndgrf.cxx                         |    2 
 sw/source/core/swg/SwXMLTextBlocks.cxx                   |    2 
 sw/source/filter/ww8/rtfattributeoutput.cxx              |    2 
 sw/source/filter/ww8/rtfexport.cxx                       |    2 
 sw/source/ui/docvw/srcedtw.cxx                           |    1 
 test/source/sheet/datapilotfield.cxx                     |    2 
 test/source/sheet/xdatabaserange.cxx                     |    2 
 test/source/sheet/xdatapilotdescriptor.cxx               |    2 
 test/source/sheet/xdatapilottable.cxx                    |    2 
 test/source/sheet/xnamedrange.cxx                        |    2 
 test/source/sheet/xnamedranges.cxx                       |    2 
 test/source/sheet/xprintareas.cxx                        |    2 
 test/source/sheet/xspreadsheets2.cxx                     |    2 
 tools/qa/cppunit/test_reversemap.cxx                     |    1 
 tools/source/rc/resmgr.cxx                               |    1 
 unotools/source/i18n/instance.hxx                        |    1 
 unotools/source/ucbhelper/ucbhelper.cxx                  |    1 
 vcl/unx/gtk/gdi/salprn-gtk.cxx                           |    2 
 writerfilter/source/dmapper/DomainMapper.cxx             |    2 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |    2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx        |    1 
 writerfilter/source/dmapper/GraphicImport.cxx            |    1 
 writerfilter/source/dmapper/ModelEventListener.cxx       |    2 
 writerfilter/source/dmapper/NumberingManager.cxx         |    2 
 writerfilter/source/dmapper/OLEHandler.cxx               |    2 
 writerfilter/source/dmapper/PropertyMap.cxx              |    2 
 writerfilter/source/filter/RtfFilter.cxx                 |    2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx           |    2 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx    |    2 
 xmloff/source/draw/shapeexport2.cxx                      |    1 
 xmlreader/source/xmlreader.cxx                           |    1 
 80 files changed, 57 insertions(+), 119 deletions(-)

New commits:
commit b854de954f3dd66b569af3a5ec5cdf81a78c70ca
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Sep 17 17:11:09 2012 -0500

    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 at gmail.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index daf26ad..ef2995c 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 0b10ffa..e561722 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 e09c84f..dc72b38 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 e59311d..5256ac0 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 353c07e..cbfb7dd 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 e9cd734..86a6e56 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 01ec08f..dd5e6ca 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 c08744e..2a0bffc 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 d93a262..d7d7755 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 67ab594..7e69cd9 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 e2531cf..4967747 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 01b0e68..5d1140f 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 7bf0016..711f09e 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 f1e9c86..5c57a64 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 0b370d7..60921c8 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 ae34f2e..894999e 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 023430c..57703d5 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 f211575..41ae941 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 4a50aa9..d1c6838 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 e1194e4..d18e815 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 a54d096..eaf9a13 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 01c2ba7..99b673d 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 10c2182..58eb29b 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 759947a..156730f 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 48dc79e..e29c637 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 f3a1d2f..3075802 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 cd98097..e02bd93 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 1e165e8..5e1b0cf 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 958adbd..73215e0 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 e909467..d41755f 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 38d5635..266f538 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 4be6541..e6f3f29 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 2a01bf3..a2656b7 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 0b8e210..fe034f0 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 b1ea8be..5b21493 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 ce73733..a168d94 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 ab521c1..67257ea 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 9cf7188..f9b7162 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 50b06e0..c83fc9b 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 6f4d0a2..7e37ac3 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 9f5e54b..3181697 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 3d51c75..810b1c1 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 3f3f15a..0b6ad20 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 9c41a8b..c985e64 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 9938a1f..8bcb27d 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 89ce42f..ef61948 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 bd4954a..215c8fe 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 589f12b..910d486 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 918e7a5..ac41693 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 c3f3aef..20bbfe2 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 d3ca9b5..fe5d852 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 15f15b7..38b32fa 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 c14c5aa..4ae68d2 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 66273f9..0305d31 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 747abf3..5f3ccdc 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 d8cb3a0..f57e3d3 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 3f6346d..d6bb683 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 5cb8849..a24eddd 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 1c91085..8330c1e 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 9f52cc6..4fd7e9f 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 407aed9..6a99309 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 13dea7d..5a38a35 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 d7d990c..af232c0 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 cf51100..8ba791a 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 6a1a069..e0378af 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 39e0835..1b6902e 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 0a76b1c..e51c552 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 0f91201..0736d69 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 e0d8316..fbdabd9 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 1745f7d..e144f6e 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 fb0d6fa..48cdf6c 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 0d8750e..b69fd2f 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 335f2f4..23b7225 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 84663e3..ae4490f 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 669b5cb..fcb7572 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 28c3823..b071449 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 bd72dd6..282f68a 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 2d1a7f8..7129b84 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 8d04c9d..0614995 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 0d2b725..fcf6e15 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"

More information about the Libreoffice-commits mailing list