From 7691e3c8ee99563749d00edadfd49b73e41429eb Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 19 Feb 2008 12:34:02 +0000 Subject: INTEGRATION: CWS notes2 (1.10.340); FILE MERGED 2008/01/27 15:53:48 mba 1.10.340.12: #i84074#: better update procedure when content of notes is changed 2007/12/15 16:12:56 mod 1.10.340.11: RESYNC: (1.11-1.12); FILE MERGED 2007/11/29 10:45:04 mba 1.10.340.10: #i84074#: store text of annotations with rich formatting 2007/09/29 16:07:09 mod 1.10.340.9: fixing resync errors 2007/09/28 16:31:01 mod 1.10.340.8: RESYNC: (1.10-1.11); FILE MERGED 2007/09/24 13:49:49 mod 1.10.340.7: notes are now collected inside SwTxtFld::SwTxtFld, IsInVisibleArea added to PostItMg, new colors for change tracking 2007/09/06 21:29:34 mod 1.10.340.6: Gradient for text, no notes for print view 2007/06/10 15:59:28 mod 1.10.340.5: #i6193# Navigator: Hide,Show,Delete / SwPostIt: Author,Date 2007/06/08 16:48:16 mod 1.10.340.4: Hiding and deleting of notes #i6193# 2007/05/29 08:24:30 mod 1.10.340.3: Collecting notes in notify, positioning in paint 2007/05/25 06:52:10 fme 1.10.340.2: #i6193# New notes - forward declarations 2007/05/24 04:34:42 mod 1.10.340.1: Initial checking, do not use --- sw/inc/docufld.hxx | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'sw/inc/docufld.hxx') diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index b31bd6666f36..1fd5bd0e47b5 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -4,9 +4,9 @@ * * $RCSfile: docufld.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 15:27:32 $ + * last change: $Author: rt $ $Date: 2008-02-19 13:34:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,15 @@ #define _DOCUFLD_HXX #ifndef _DATE_HXX //autogen -#include + #include #endif + +#ifndef _DATETIME_HXX //autogen +#include +#endif + + + #ifndef _SFXMACITEM_HXX //autogen #include #endif @@ -48,6 +55,8 @@ class _SetGetExpFlds; class SwTxtFld; class SwFrm; +class OutlinerParaObject; +class SwTextAPIObject; enum SwAuthorFormat { @@ -505,10 +514,13 @@ public: class SwPostItFieldType : public SwFieldType { +private: + SwDoc* mpDoc; public: - SwPostItFieldType(); + SwPostItFieldType(SwDoc* pDoc); virtual SwFieldType* Copy() const; + SwDoc* GetDoc() {return mpDoc;}; }; /*-------------------------------------------------------------------- @@ -517,18 +529,22 @@ public: class SwPostItField : public SwField { - String sTxt; // die Anmerkung - String sAuthor; // der Author - Date aDate; // Datum ??/Zeit?? der Anmerkung + String sTxt; // die Anmerkung + String sAuthor; // der Author + DateTime aDateTime; // Datum und Zeit der Anmerkung + OutlinerParaObject* mpText; + SwTextAPIObject* m_pTextObject; public: SwPostItField( SwPostItFieldType*, - const String& rAuthor, const String& rTxt, const Date& rDate); + const String& rAuthor, const String& rTxt, const DateTime& rDate); + ~SwPostItField(); virtual String Expand() const; virtual SwField* Copy() const; - inline const Date& GetDate() const { return aDate; } + inline const Date GetDate() const { return aDateTime.GetDate(); } + inline const Time GetTime() const { return aDateTime.GetTime(); } // Author virtual const String& GetPar1() const; @@ -539,6 +555,9 @@ public: virtual void SetPar2(const String& rStr); const String& GetTxt() const { return sTxt; } + const OutlinerParaObject* GetTextObject() const; + void SetTextObject( OutlinerParaObject* pText ); + virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); virtual String GetDescription() const; -- cgit