diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-17 17:11:09 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-18 10:10:06 +0000 |
commit | b854de954f3dd66b569af3a5ec5cdf81a78c70ca (patch) | |
tree | aa714f91b96eb1b5ea00f677deb6dee0b5850d7f /writerfilter | |
parent | 96b45756b46ceb06dbec5c241d09acc96891e121 (diff) |
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>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/ModelEventListener.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/OLEHandler.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
10 files changed, 8 insertions, 10 deletions
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> |