summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-12-10 23:18:57 +0100
committerMathias Bauer <mba@openoffice.org>2009-12-10 23:18:57 +0100
commita09cbd7dbeb0194aa408128ea411fb316c72d581 (patch)
treeb592b4c74f5a1c3c222667ea155486095a342b4c /sfx2
parent01a1d08f17800fb7118835a13230226f536d627f (diff)
#i107450#: move two methods needed in EditEngine from SfxHTMLParser to HTMLParser
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx5
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx34
2 files changed, 0 insertions, 39 deletions
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 270087cf24a9..80804cf72fad 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -84,8 +84,6 @@ public:
LanguageType& eNumLang, const String& aValStr,
const String& aNumStr, SvNumberFormatter& rFormatter );
- static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader );
-
protected:
// Start eines File-Downloads. Dieser erfolgt synchron oder asynchron.
@@ -124,9 +122,6 @@ protected:
// Default (auch ohne Iterator) ist JavaScript
ScriptType GetScriptType( SvKeyValueIterator* ) const;
const String& GetScriptTypeString( SvKeyValueIterator* ) const;
-
- BOOL SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader );
-
};
inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 794ee142708c..ee3dd4519337 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -357,40 +357,6 @@ IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
return 0;
}
-rtl_TextEncoding SfxHTMLParser::GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader )
-{
- rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW;
- if( pHTTPHeader )
- {
- SvKeyValue aKV;
- for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont;
- bCont = pHTTPHeader->GetNext( aKV ) )
- {
- if( aKV.GetKey().EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) )
- {
- if( aKV.GetValue().Len() )
- {
- eRet = SfxHTMLParser::GetEncodingByMIME( aKV.GetValue() );
- }
- }
- }
- }
- return eRet;
-}
-
-BOOL SfxHTMLParser::SetEncodingByHTTPHeader(
- SvKeyValueIterator *pHTTPHeader )
-{
- BOOL bRet = FALSE;
- rtl_TextEncoding eEnc = SfxHTMLParser::GetEncodingByHttpHeader( pHTTPHeader );
- if(RTL_TEXTENCODING_DONTKNOW != eEnc)
- {
- SetSrcEncoding( eEnc );
- bRet = TRUE;
- }
- return bRet;
-}
-
void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
{
aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_JAVASCRIPT);