diff options
-rw-r--r-- | include/editeng/editdata.hxx | 3 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 1 | ||||
-rw-r--r-- | include/editeng/svxacorr.hxx | 1 | ||||
-rw-r--r-- | include/formula/FormulaCompiler.hxx | 1 | ||||
-rw-r--r-- | include/svx/gallery.hxx | 1 | ||||
-rw-r--r-- | include/svx/nbdtmg.hxx | 1 | ||||
-rw-r--r-- | include/svx/numfmtsh.hxx | 1 | ||||
-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 | ||||
-rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/inc/fltshell.hxx | 4 |
13 files changed, 12 insertions, 14 deletions
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index f0485a275f87..0ba253839e52 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -21,7 +21,8 @@ #ifndef _MyEDITDATA_HXX #define _MyEDITDATA_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> +#include <tools/solar.h> #include "editeng/editengdllapi.h" class SfxItemSet; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 325af9ecbda7..5500b13433a6 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -31,6 +31,7 @@ #include <i18nlangtag/lang.h> #include "editeng/editengdllapi.h" +#include <tools/lineend.hxx> #include <tools/rtti.hxx> // due to typedef TypeId #include <editeng/eedata.hxx> diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 846e15f29a32..cb22d3f5e53a 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -27,7 +27,6 @@ #include <i18nlangtag/languagetag.hxx> #include <tools/time.hxx> #include <tools/date.hxx> -#include <tools/string.hxx> #include <editeng/swafopt.hxx> #include "editeng/editengdllapi.h" diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index d5509a9906ad..ae46a6db1f80 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -34,7 +34,6 @@ #include "formula/grammar.hxx" #include "formula/token.hxx" #include "formula/ExternalReferenceHelper.hxx" -#include <tools/string.hxx> #define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */ #define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */ diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index bae89c2e4931..c26479a59fe9 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -21,7 +21,6 @@ #define _GALLERY_HXX_ #include <tools/solar.h> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <vector> #include "svx/svxdllapi.h" diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 4ce8af4445de..ab157e216fc7 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -22,7 +22,6 @@ #include <boost/shared_ptr.hpp> #include <vector> #include <editeng/numitem.hxx> -#include <tools/string.hxx> #include <vcl/font.hxx> namespace svx { namespace sidebar { diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 382a466343c0..98fc98017a4b 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -19,7 +19,6 @@ #ifndef _SVX_NUMFMTSH_HXX #define _SVX_NUMFMTSH_HXX -#include <tools/string.hxx> #include <i18nlangtag/lang.h> #include "svx/svxdllapi.h" 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> diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 3cb94f937feb..290f7e5811b1 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -260,7 +260,7 @@ sal_uLong SwASCIIParser::ReadChars() { sal_uLong nLen, nOrig; nOrig = nLen = rInput.Read(pArr, ASC_BUFFLEN); - CharSet eCharSet; + rtl_TextEncoding eCharSet; bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, &bSwapUnicode); OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must " "have failed"); @@ -276,7 +276,7 @@ sal_uLong SwASCIIParser::ReadChars() rtl_TextToUnicodeConverter hConverter=0; rtl_TextToUnicodeContext hContext=0; - CharSet currentCharSet = pUseMe->GetCharSet(); + rtl_TextEncoding currentCharSet = pUseMe->GetCharSet(); if (RTL_TEXTENCODING_UCS2 != currentCharSet) { if( currentCharSet == RTL_TEXTENCODING_DONTKNOW ) diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index d3af051b4fa6..9dee91c0e57b 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -529,7 +529,7 @@ class SwFltShell // OUString sBaseURL; sal_uInt16 nPageDescOffset; // fuers update der pagedescs - CharSet eSrcCharSet; // charset der quelle + rtl_TextEncoding eSrcCharSet; // charset der quelle friend class SwFltControlStack; sal_Bool bNewDoc; sal_Bool bStdPD; @@ -541,7 +541,7 @@ public: SwDoc& GetDoc() { return *aStack.pDoc; } - CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet; + rtl_TextEncoding SetCharSet(rtl_TextEncoding eNew) { rtl_TextEncoding eOld = eSrcCharSet; eSrcCharSet = eNew; return eOld; } |