diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:39:59 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:39:59 +0000 |
commit | 27b61e161e5b58a250f8af7fc527f8b312e48b60 (patch) | |
tree | 09b2f531b64dfb8fc01227e11a1cc4722073b3be /dbaccess/source/ui | |
parent | 37b36de3537dd63adfc6732f21532ed32859977d (diff) |
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
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 41d013f6da77..53aae94224b5 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TokenWriter.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2008-01-30 08:51:00 $ + * last change: $Author: obo $ $Date: 2008-02-26 14:39:59 $ * * 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 @@ BOOL OHTMLImportExport::Read() //------------------------------------------------------------------- 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 ); } |