diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:39:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:39:40 +0000 |
| commit | 866a2eb3762bd89e942411168da217a53af63f4a (patch) | |
| tree | f27eec8918e7c481922ac48fde0472080f80c706 /dbaccess/source/ui/misc/HtmlReader.cxx | |
| parent | f47953faf918bdece7cad85d21bf890e4882bd5b (diff) | |
INTEGRATION: CWS custommeta (1.31.28); FILE MERGED
2008/02/01 10:33:57 mst 1.31.28.2: RESYNC: (1.31-1.32); FILE MERGED
2008/01/16 17:15:33 mst 1.31.28.1: - dbaccess/source/ui/misc/{HtmlReader.cxx,TokenWriter.cxx}:
+ use XDocumentProperties instead of SfxDocumentInfo when importing and
exporting
Diffstat (limited to 'dbaccess/source/ui/misc/HtmlReader.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 6dc36b91c..354f32a86 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: rt $ $Date: 2008-01-30 08:50:19 $ + * last change: $Author: obo $ $Date: 2008-02-26 14:39:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,9 +56,6 @@ #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif -#ifndef _SFXDOCINF_HXX -#include <sfx2/docinf.hxx> -#endif #ifndef _SFXHTML_HXX #include <sfx2/sfxhtml.hxx> #endif @@ -649,12 +646,10 @@ void OHTMLReader::setTextEncoding() m_bMetaOptions = sal_True; USHORT nContentOption = HTML_O_CONTENT; rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; - USHORT nMetaTags = 0; - ::std::auto_ptr<SfxDocumentInfo> pInfo(new SfxDocumentInfo()); - SfxHTMLParser::ParseMetaOptions( pInfo.get(), NULL, + SfxHTMLParser::ParseMetaOptions(NULL, NULL, GetOptions(&nContentOption), - nMetaTags, eEnc ); + eEnc ); // If the encoding is set by a META tag, it may only overwrite the // current encoding if both, the current and the new encoding, are 1-BYTE |