diff options
| -rw-r--r-- | sfx2/inc/sfx2/sfxhtml.hxx | 5 | ||||
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 34 | ||||
| -rw-r--r-- | svx/source/editeng/eehtml.cxx | 2 | ||||
| -rw-r--r-- | svx/source/editeng/eehtml.hxx | 8 |
4 files changed, 3 insertions, 46 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); diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index c76ef59d4c1a..9411d4110aab 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -52,7 +52,7 @@ #define STYLE_PRE 101 EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) - : SfxHTMLParser( rIn, true ) + : HTMLParser( rIn, true ) , aBaseURL( rBaseURL ) { pImpEditEngine = 0; diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx index 44146eb0d227..d213cb119761 100644 --- a/svx/source/editeng/eehtml.hxx +++ b/svx/source/editeng/eehtml.hxx @@ -34,7 +34,7 @@ #include <svl/svarray.hxx> #include <editdoc.hxx> -#include <sfx2/sfxhtml.hxx> +#include <svtools/parhtml.hxx> class ImpEditEngine; @@ -46,9 +46,7 @@ struct AnchorInfo String aText; }; -#ifndef SVX_LIGHT - -class EditHTMLParser : public SfxHTMLParser +class EditHTMLParser : public HTMLParser { using HTMLParser::CallParser; private: @@ -100,6 +98,4 @@ public: SV_DECL_REF( EditHTMLParser ) SV_IMPL_REF( EditHTMLParser ); -#endif - #endif // _EEHTML_HXX |