User: obo
Date: 2008-02-26 14:39:43+0000
Modified:
dba/dbaccess/source/ui/misc/HtmlReader.cxx
Log:
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
File Changes:
Directory: /dba/dbaccess/source/ui/misc/
========================================
File [changed]: HtmlReader.cxx
Url:
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.32&r2=1.33
Delta lines: +2 -7
-------------------
--- HtmlReader.cxx 2008-01-30 08:50:19+0000 1.32
+++ HtmlReader.cxx 2008-02-26 14:39:40+0000 1.33
@@ -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 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
