User: obo
Date: 2008-02-26 14:40:02+0000
Modified:
dba/dbaccess/source/ui/misc/TokenWriter.cxx
Log:
INTEGRATION: CWS custommeta (1.34.68); FILE MERGED
2008/02/01 10:34:00 mst 1.34.68.2: RESYNC: (1.34-1.35); FILE MERGED
2008/01/16 17:15:33 mst 1.34.68.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]: TokenWriter.cxx
Url:
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TokenWriter.cxx?r1=1.35&r2=1.36
Delta lines: +11 -7
--------------------
--- TokenWriter.cxx 2008-01-30 08:51:00+0000 1.35
+++ TokenWriter.cxx 2008-02-26 14:39:59+0000 1.36
@@ -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]
