CWS-TOOLING: integrate CWS dr66

2009-01-22 15:51:40 +0100 dr  r266730 : #i98028# moved to CWS dr66
2009-01-22 15:50:28 +0100 dr  r266729 : #i98028# moved to CWS dr66
2009-01-20 16:25:49 +0100 dr  r266595 : #i98282# resolve palette colors while loading chart gradients (convert back to unx lineends...)
2009-01-20 16:23:19 +0100 dr  r266594 : #i98282# resolve palette colors while loading chart gradients
2009-01-19 15:43:57 +0100 dr  r266507 : #i97900# move fix to CWS dr66
2009-01-19 15:40:28 +0100 dr  r266506 : #i97900# move fix to CWS dr66
2009-01-19 15:20:14 +0100 dr  r266505 : #i98141# correctly update note position while switching LTR/RTL mode of sheet
2009-01-06 10:28:02 +0100 dr  r265899 : CWS-TOOLING: rebase CWS dr66 to trunk@265758 (milestone: DEV300:m38)
2008-11-13 13:59:02 +0100 dr  r263644 : #i10000# merge problems
2008-11-13 13:25:15 +0100 dr  r263639 : #i10000# merge problems
2008-11-13 13:22:58 +0100 dr  r263638 : #i10000# merge problems
2008-11-13 13:22:25 +0100 dr  r263637 : #i10000# merge problems
2008-11-12 13:40:46 +0100 dr  r263595 : #i10000# merge problem
2008-11-12 11:34:51 +0100 dr  r263583 : CWS-TOOLING: rebase CWS dr66 to trunk@263288 (milestone: DEV300:m35)
2008-11-11 16:58:11 +0100 dr  r263568 : CWS-TOOLING: rebase CWS dr66 to trunk@262087 (milestone: DEV300:m33)
2008-10-27 14:38:34 +0100 dr  r262675 : migrate CWS dr66 to SVN

1 files changed, 22 insertions, 15 deletions

diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 4fda448c49c0..edfff3c8dc7c 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: detfunc.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.128.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,6 +40,7 @@ class SdrObject;
 class SdrPage;
 class String;
 
+class ScPostIt;
 class ScCommentData;
 class ScDetectiveData;
 class ScDocument;
@@ -48,7 +49,7 @@ class ScRange;
 
 #define SC_DET_MAXCIRCLE    1000
 
-enum ScDetectiveDelete { SC_DET_ALL, SC_DET_DETECTIVE, SC_DET_CIRCLES, SC_DET_COMMENTS, SC_DET_ARROWS };
+enum ScDetectiveDelete { SC_DET_ALL, SC_DET_DETECTIVE, SC_DET_CIRCLES, SC_DET_ARROWS };
 
 enum ScDetectiveObjType
 {
@@ -69,6 +70,24 @@ class SC_DLLPUBLIC ScDetectiveFunc
     ScDocument*     pDoc;
     SCTAB           nTab;
 
+    enum DrawPosMode
+    {
+        DRAWPOS_TOPLEFT,        /// Top-left edge of the cell.
+        DRAWPOS_BOTTOMRIGHT,    /// Bottom-right edge of the cell.
+        DRAWPOS_DETARROW,       /// Position inside cell for detective arrows.
+        DRAWPOS_CAPTIONLEFT,    /// Top-left edge of the cell for captions.
+        DRAWPOS_CAPTIONRIGHT    /// Top-right edge of the cell for captions (incl. merged cells).
+    };
+
+    /** Returns a drawing layer position for the passed cell address. */
+    Point       GetDrawPos( SCCOL nCol, SCROW nRow, DrawPosMode eMode ) const;
+
+    /** Returns the drawing layer rectangle for the passed cell range. */
+    Rectangle   GetDrawRect( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
+
+    /** Returns the drawing layer rectangle for the passed cell address. */
+    Rectangle   GetDrawRect( SCCOL nCol, SCROW nRow ) const;
+
     BOOL        HasArrow( const ScAddress& rStart,
                             SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
 
@@ -97,11 +116,6 @@ class SC_DLLPUBLIC ScDetectiveFunc
 
     void        DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData );
 
-    SdrObject*  DrawCaption( SCCOL nCol, SCROW nRow, const String& rText,
-                                ScCommentData& rData, SdrPage* pDestPage,
-                                BOOL bHasUserText, BOOL bLeft,
-                                const Rectangle& rVisible );
-
     USHORT      InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel );
     USHORT      InsertPredLevelArea( const ScRange& rRef,
                                         ScDetectiveData& rData, USHORT nLevel );
@@ -122,7 +136,6 @@ class SC_DLLPUBLIC ScDetectiveFunc
 public:
                 ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {}
 
-    Point       GetDrawPos( SCCOL nCol, SCROW nRow, BOOL bArrow );
     BOOL        ShowSucc( SCCOL nCol, SCROW nRow );
     BOOL        ShowPred( SCCOL nCol, SCROW nRow );
     BOOL        ShowError( SCCOL nCol, SCROW nRow );
@@ -133,13 +146,7 @@ public:
 
     BOOL        MarkInvalid(BOOL& rOverflow);
 
-    SdrObject*  ShowComment( SCCOL nCol, SCROW nRow, BOOL bForce, SdrPage* pDestPage = NULL );
-    SdrObject*  ShowCommentUser( SCCOL nCol, SCROW nRow, const String& rUserText,
-                                    const Rectangle& rVisible, BOOL bLeft,
-                                    BOOL bForce, SdrPage* pDestPage );
-    BOOL        HideComment( SCCOL nCol, SCROW nRow );
-
-    void        UpdateAllComments();        // on all tables
+    static void UpdateAllComments( ScDocument& rDoc );        // on all tables
     void        UpdateAllArrowColors();     // on all tables
 
     static BOOL IsNonAlienArrow( SdrObject* pObject );