diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 12:41:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 14:26:32 +0100 |
| commit | 42def53fb1fee0b4e57279d11c05e54601aeed1b (patch) | |
| tree | 2cba05a85a00823276db96f1b698e55e3b1459c8 /sc | |
| parent | remove uses of COMPARE_* (diff) | |
| download | core-42def53fb1fee0b4e57279d11c05e54601aeed1b.tar.gz core-42def53fb1fee0b4e57279d11c05e54601aeed1b.zip | |
remove unnecessary tools/string.hxx includes
Change-Id: I8ed341aeef90584dfc545a794f999e3adc08dd72
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/userlist.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/address.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/autoform.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/ftools/ftools.cxx | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index f87f32826ecb..23c68199a73a 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -21,7 +21,6 @@ #define SC_USERLIST_HXX #include <tools/stream.hxx> -#include <tools/string.hxx> #include "scdllapi.h" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index c4fab07f51ad..4f465f9aa3bb 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/sheet/ExternalLinkType.hpp> #include <comphelper/string.hxx> #include <sfx2/objsh.hxx> +#include <tools/string.hxx> #include <tools/urlobj.hxx> using namespace ::com::sun::star; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index e04762a7f798..924458a89187 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -362,13 +362,13 @@ sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVe if( 0 == rVersions.nNumFmtVersion ) { // --- from 680/dr25 on: store strings as UTF-8 - CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); + rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); aNumFormat.Load( rStream, eCharSet ); } // adjust charset in font - CharSet eSysSet = osl_getThreadTextEncoding(); - CharSet eSrcSet = rStream.GetStreamCharSet(); + rtl_TextEncoding eSysSet = osl_getThreadTextEncoding(); + rtl_TextEncoding eSrcSet = rStream.GetStreamCharSet(); if( eSrcSet != eSysSet && aFont.GetCharSet() == eSrcSet ) aFont.SetCharSet(eSysSet); diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index f5f98c65e88e..5b841e0babf7 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -18,6 +18,7 @@ */ #include "ftools.hxx" +#include <osl/thread.h> #include <rtl/strbuf.hxx> #include <tools/color.hxx> #include <unotools/charclass.hxx> |