INTEGRATION: CWS custommeta (1.21.518); FILE MERGED

2008/01/16 17:50:13 mst 1.21.518.1: interface change: SvxRTFParser
- svx/inc/svxrtf.hxx, svx/source/svrtf/svxrtf.cxx,
svx/source/editeng/eertfpar.cxx:
+ SvxRTFParser::SvxRTFParser takes a XDocumentProperties parameter
instead of SfxDocumentInfo
+ remove method SvxRTFParser::GetDocInfo
- svx/source/svrtf/makefile.mk:
+ enable exceptions for svxrtf.cxx

1 files changed, 17 insertions, 7 deletions

diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx
index 93d6551cf581..a89f6426bc70 100644
--- a/svx/inc/svxrtf.hxx
+++ b/svx/inc/svxrtf.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svxrtf.hxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: ihi $ $Date: 2006-11-14 12:56:40 $
+ *  last change: $Author: obo $ $Date: 2008-02-26 14:35:12 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -64,7 +64,16 @@ class DateTime;
 struct SvxRTFStyleType;
 class SvxRTFItemStackType;
 class SvxRTFItemStackList;
-class SfxDocumentInfo;
+
+namespace com { namespace sun { namespace star {
+    namespace document {
+        class XDocumentProperties;
+    }
+    namespace util {
+        class DateTime;
+    }
+} } }
+
 
 // Mapper-Klassen fuer die verschiedenen Anforderungen an Doc-Positionen
 //        Swg - NodePosition ist ein SwIndex, der intern veraendert wird
@@ -243,7 +252,8 @@ class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser
     SfxItemPool* pAttrPool;
     Color*  pDfltColor;
     Font*   pDfltFont;
-    SfxDocumentInfo* pSfxInfo;
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::document::XDocumentProperties> m_xDocProps;
     SfxItemSet *pRTFDefaults;
 
     long    nVersionNo;
@@ -312,7 +322,7 @@ protected:
     void ReadTabAttr( int nToken, SfxItemSet& rSet );
 
     // Dokument-Info lesen
-    DateTime& GetDateTimeStamp( DateTime& rDT );
+    ::com::sun::star::util::DateTime GetDateTimeStamp( );
     String& GetTextToEndGroup( String& rStr );
     virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 );
 
@@ -336,6 +346,8 @@ protected:
 
     SvxRTFParser( SfxItemPool& rAttrPool,
                     SvStream& rIn,
+                    ::com::sun::star::uno::Reference<
+                        ::com::sun::star::document::XDocumentProperties> i_xDocProps,
                     int bReadNewDoc = TRUE );
     virtual ~SvxRTFParser();
 
@@ -368,8 +380,6 @@ protected:
     SvxRTFColorTbl& GetColorTbl()               { return aColorTbl; }
     SvxRTFFontTbl& GetFontTbl()                 { return aFontTbl; }
 
-    SfxDocumentInfo* GetDocInfo() const         { return pSfxInfo; }
-
     const String& GetBaseURL() const            { return sBaseURL; }
 
         // lesen die GrafikDaten und fuelle damit die Grafik und die