summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-04-13 15:12:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-04-13 15:12:21 +0100
commit8eb3e965e0fcc86f9ddc05ea54fd58fd6579045b (patch)
tree17b9f66ed94cd25b709b58c0e8d426aef7b3381c /sfx2
parent63f6f4c41642da11592944c52bda33b436ec0e26 (diff)
default to UTF8 for html encoding
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 8ab736b085..f41c4f525b 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -80,15 +80,12 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
pMedium( pMed ), pDLMedium( 0 ),
nMetaTags( 0 )
{
- DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ),
+ DBG_ASSERT( RTL_TEXTENCODING_UTF8 == GetSrcEncoding( ),
"SfxHTMLParser::SfxHTMLParser: From where comes ZS?" );
+
DBG_ASSERT( !IsSwitchToUCS2(),
"SfxHTMLParser::SfxHTMLParser: Switch to UCS2?" );
- // Altough the real default encoding is ISO8859-1, we use MS-1252
- // as default encoding.
- SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
-
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
}