Tag: cws_src680_custommeta
User: mst
Date: 2008-01-16 17:15:35+0000
Modified:
dba/dbaccess/source/ui/misc/HtmlReader.cxx
dba/dbaccess/source/ui/misc/TokenWriter.cxx
Log:
- 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.31&r2=1.31.28.1
Delta lines: +5 -10
--------------------
--- HtmlReader.cxx 2007-11-21 16:06:18+0000 1.31
+++ HtmlReader.cxx 2008-01-16 17:15:33+0000 1.31.28.1
@@ -4,9 +4,9 @@
*
* $RCSfile: HtmlReader.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.31.28.1 $
*
- * last change: $Author: ihi $ $Date: 2007/11/21 16:06:18 $
+ * last change: $Author: mst $ $Date: 2008/01/16 17:15:33 $
*
* 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 @@
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
File [changed]: TokenWriter.cxx
Url:
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TokenWriter.cxx?r1=1.34&r2=1.34.68.1
Delta lines: +14 -10
---------------------
--- TokenWriter.cxx 2007-09-26 14:51:22+0000 1.34
+++ TokenWriter.cxx 2008-01-16 17:15:33+0000 1.34.68.1
@@ -4,9 +4,9 @@
*
* $RCSfile: TokenWriter.cxx,v $
*
- * $Revision: 1.34 $
+ * $Revision: 1.34.68.1 $
*
- * last change: $Author: hr $ $Date: 2007/09/26 14:51:22 $
+ * last change: $Author: mst $ $Date: 2008/01/16 17:15:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -89,6 +89,7 @@
#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP_
#include <com/sun/star/awt/FontUnderline.hpp>
#endif
+#include <com/sun/star/document/XDocumentProperties.hpp>
#ifndef _HTMLKYWD_HXX
#include <svtools/htmlkywd.hxx>
#endif
@@ -101,9 +102,6 @@
#ifndef _HTMLOUT_HXX
#include <svtools/htmlout.hxx>
#endif
-#ifndef _SFXDOCINF_HXX
-#include <sfx2/docinf.hxx>
-#endif
#ifndef _FRMHTMLW_HXX
#include <sfx2/frmhtmlw.hxx>
#endif
@@ -129,6 +127,7 @@
using namespace dbaui;
using namespace dbtools;
using namespace svx;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -745,13 +744,18 @@
//-------------------------------------------------------------------
void OHTMLImportExport::WriteHeader()
{
- SfxDocumentInfo rInfo;
- rInfo.SetTitle(m_sName);
- String aStrOut;
+ uno::Reference<document::XDocumentProperties> xDocProps(
+ m_xFactory->createInstance(::rtl::OUString::createFromAscii(
+ "com.sun.star.document.DocumentProperties")),
+ uno::UNO_QUERY);
+ if (xDocProps.is()) {
+ xDocProps->setTitle(m_sName);
+ }
IncIndent(1); TAG_ON_LF( sHTML_head );
- SfxFrameHTMLWriter::Out_DocInfo( (*m_pStream), String(), &rInfo,
sIndent );
+ SfxFrameHTMLWriter::Out_DocInfo( (*m_pStream), String(),
+ xDocProps, sIndent );
OUT_LF();
IncIndent(-1); OUT_LF(); TAG_OFF_LF( sHTML_head );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
