INTEGRATION: CWS notes5 (1.5.30); FILE MERGED

2008/06/13 15:22:14 mod 1.5.30.8: RESYNC: (1.5-1.6); FILE MERGED
2008/05/19 13:53:32 mod 1.5.30.7: broadcast new language to note
2008/05/18 21:52:42 mod 1.5.30.6: broadcast spellchecking change
2008/05/15 00:21:02 mod 1.5.30.5: #i88874
2008/05/11 21:24:48 mod 1.5.30.4: Change Tracking: mark deleted notes
2008/05/09 15:06:23 ama 1.5.30.3: Helperfunctions for notes & change tracking
2008/05/06 19:37:48 mod 1.5.30.2: merge from notes4
2008/05/05 14:40:14 mod 1.5.30.1: language settings inside notes

1 files changed, 15 insertions, 22 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 58ed11fd0f..9b9ea94f0d 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PostItMgr.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,6 +51,7 @@ class SwPostIt;
 class SwEditWin;
 class Color;
 class SvxSearchItem;
+class SvxLanguageItem;
 
 #define SORT_POS	1
 #define SORT_AUTHOR	2
@@ -59,24 +60,7 @@ class SvxSearchItem;
 #define COL_NOTES_SIDEPANE_ARROW_ENABLED	RGB_COLORDATA(0,0,0)
 #define COL_NOTES_SIDEPANE_ARROW_DISABLED	RGB_COLORDATA(172,168,153)
 
-
-struct SwPostItItem
-{
-    bool bShow;
-    bool bFocus;
-    SwFmtFld* pFmtFld;
-    SwPostIt* pPostIt;
-    SwRect mPos;
-    SwRect mFramePos;
-    SwRect mPagePos;
-    SwPostItItem( SwFmtFld* p, bool aShow, bool aFocus)
-        : bShow(aShow),
-        bFocus(aFocus),
-        pFmtFld(p),
-        pPostIt(0)
-    {	
-    }
-};
+struct SwPostItItem;
 
 typedef std::list<SwPostItItem*> SwPostItItem_list;
 
@@ -104,6 +88,9 @@ struct FieldShadowState
     const SwPostItField* mpShadowFld;
     bool bCursor;
     bool bMouse;
+    FieldShadowState(): mpShadowFld(0),bCursor(false),bMouse(false)
+    {
+    }
 };
 
 class SwPostItMgr: public SfxListener
@@ -138,6 +125,13 @@ class SwPostItMgr: public SfxListener
         bool            ArrowEnabled(USHORT aDirection,unsigned long aPage) const;
         bool            BorderOverPageBorder(unsigned long aPage) const;
         bool            HasScrollbars() const;
+
+        void			SetColors(SwPostIt* pPostIt, SwPostItField* pFld);
+
+        Color			GetColorDark(sal_uInt16 aAuthorIndex);
+        Color			GetColorLight(sal_uInt16 aAuthorIndex);
+        Color			GetColorAnkor(sal_uInt16 aAuthorIndex);
+            
         sal_Int32       GetInitialAnchorDistance() const;
         sal_Int32       GetScrollSize() const;
         sal_Int32       GetSpaceBetween() const;
@@ -173,8 +167,7 @@ class SwPostItMgr: public SfxListener
             void PrepareView(bool bIgnoreCount = false);
 
             void CorrectPositions();
-            void SetColors(SwPostIt* pPostIt, SwPostItField* pFld);
-
+            
             void Sort(const short aType);
 
             void SetLayout() { mbLayout = true; };
@@ -209,7 +202,7 @@ class SwPostItMgr: public SfxListener
 
             void SetShadowState(const SwPostItField* pFld,bool bCursor = true);
 
-            void SetSpellChecking(bool bEnable);
+            void SetSpellChecking();
 
             bool ShowPreview(const SwField* pFld,SwFmtFld*& pFmtFld) const;
 };