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

23 files changed, 153 insertions, 122 deletions

diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 88fb9f479087..1eaf2200de10 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbdocfun.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index d5a3ba864395..82739bfdd274 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbfunc.hxx,v $
- * $Revision: 1.11.30.2 $
+ * $Revision: 1.12.100.1 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 103d17c9dd8d..101caae8d999 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docfunc.hxx,v $
- * $Revision: 1.18.30.2 $
+ * $Revision: 1.19.100.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -96,7 +96,11 @@ public:
     ScBaseCell*     InterpretEnglishString( const ScAddress& rPos, const String& rText,
                                             const formula::FormulaGrammar::Grammar eGrammar );
 
-    BOOL            SetNoteText( const ScAddress& rPos, const String& rText, BOOL bApi );
+    bool            ShowNote( const ScAddress& rPos, bool bShow = true );
+    inline bool     HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
+
+    bool            SetNoteText( const ScAddress& rPos, const String& rNoteText, BOOL bApi );
+    bool            ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, BOOL bApi );
 
     BOOL            ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
                                     BOOL bRecord, BOOL bApi );
@@ -163,8 +167,6 @@ public:
                                 BOOL bRecord, BOOL bApi );
     BOOL            UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
 
-    BOOL            SetNote( const ScAddress& rPos, const ScPostIt& rNote, BOOL bApi );
-
     BOOL            SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi );     // takes ownership of pNewRanges
     BOOL            ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
 
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 86228bde58be..8a9dd449686d 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docsh.hxx,v $
- * $Revision: 1.50.32.2 $
+ * $Revision: 1.50.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -321,6 +321,7 @@ public:
     void            PostPaint( const ScRange& rRange, USHORT nPart, USHORT nExtFlags = 0 );
 
     void            PostPaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
+    void            PostPaintCell( const ScAddress& rPos );
     void            PostPaintGridAll();
     void            PostPaintExtras();
 
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 85dfd59d5ba9..33d0f4adf95d 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: drawview.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.12.126.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,6 +39,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class
 
 class ScDocument;
 class ScViewData;
+class ScDrawObjData;
 
 class ScDrawView: public FmFormView
 {
@@ -58,7 +59,6 @@ class ScDrawView: public FmFormView
 
 protected:
     virtual void    ModelHasChanged();
-    virtual void    MakeVisible( const Rectangle& rRect, Window& rWin );
 
     // add custom handles (used by other apps, e.g. AnchorPos)
     virtual void AddCustomHdl();
@@ -74,6 +74,10 @@ public:
 
     virtual void    DoConnect(SdrOle2Obj* pOleObj);
 
+    virtual void    MakeVisible( const Rectangle& rRect, Window& rWin );
+
+    virtual void    DeleteMarked();
+
     void            DrawMarks( OutputDevice* pOut ) const;
 
     void            MarkDropObj( SdrObject* pObj );
@@ -111,13 +115,34 @@ public:
 
     BOOL            SelectObject( const String& rName );
 //UNUSED2008-05  String         GetSelectedChartName() const;
-    BOOL            HasMarkedControl() const;
+    bool            HasMarkedControl() const;
+    bool            HasMarkedInternal() const;
 
     FASTBOOL        InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
 
+    /** Returns the selected object, if it is the caption object of a cell note.
+        @param ppCaptData  (out-param) If not null, returns the pointer to the caption object data. */
+    SdrObject*      GetMarkedNoteCaption( ScDrawObjData** ppCaptData = 0 );
+
+    /** Locks/unlocks the specified layer in the draw page.
+        Unlocked layer is required to be able to edit the contained objects. */
+    void            LockCalcLayer( SdrLayerID nLayer, bool bLock = true );
+    /** Unlocks the specified layer in the draw page. */
+    inline void     UnlockCalcLayer( SdrLayerID nLayer ) { LockCalcLayer( nLayer, false ); }
+
+    /** Locks/unlocks the background layer that contains background objects.
+        Unlocked layer is required to be able to edit the objects. */
+    inline void     LockBackgroundLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }
+    /** Unlocks the background layer that contains background objects. */
+    inline void     UnlockBackgroundLayer() { LockBackgroundLayer( false ); }
+
+    /** Locks/unlocks the internal layer that contains caption objects of cell notes.
+        Unlocked layer is required to be able to edit the contained objects. */
+    inline void     LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); }
+    /** Unlocks the internal layer that contains caption objects of cell notes. */
+    inline void     UnlockInternalLayer() { LockInternalLayer( false ); }
+
     SdrEndTextEditKind  ScEndTextEdit();    // ruft SetDrawTextUndo(0)
-    void                    StoreCaptionAttribs();
-    void                    StoreCaptionDimensions();
     void                    CaptionTextDirection(USHORT nSlot);
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
 };
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index 35b429af9a14..cfd21532cc6e 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconarc.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,12 +31,8 @@
 #ifndef SC_FUCONARC_HXX
 #define SC_FUCONARC_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fuconstr.hxx"
 
-
 /*************************************************************************
 |*
 |* Rechteck zeichnen
@@ -46,7 +42,7 @@
 class FuConstArc : public FuConstruct
 {
  public:
-    FuConstArc( ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstArc( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                    SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstArc();
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index 385327b0a028..085cad8d7815 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconcustomshape.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,7 +40,7 @@ class FuConstCustomShape : public FuConstruct
     void SetAttributes( SdrObject* pObj );
 
 public:
-    FuConstCustomShape(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstCustomShape(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                        SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstCustomShape();
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index a531387922b9..bcfb20aa6896 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconpol.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,13 +31,8 @@
 #ifndef SC_FUCONPOL_HXX
 #define SC_FUCONPOL_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fuconstr.hxx"
 
-
-
 /*************************************************************************
 |*
 |* Basisklasse fuer alle Funktionen
@@ -49,7 +44,7 @@ class FuConstPolygon : public FuConstruct
     Point aLastPos;
 
  public:
-    FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                    SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstPolygon();
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index d57c386cd69e..ddd7579782a7 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconrec.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,12 +31,8 @@
 #ifndef SC_FUCONREC_HXX
 #define SC_FUCONREC_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fuconstr.hxx"
 
-
 /*************************************************************************
 |*
 |* Rechteck zeichnen
@@ -46,7 +42,7 @@
 class FuConstRectangle : public FuConstruct
 {
  public:
-    FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                    SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstRectangle();
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 08f5127a1835..daae26dd84ed 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconstr.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,9 +31,6 @@
 #ifndef SC_FUCONSTR_HXX
 #define SC_FUCONSTR_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fudraw.hxx"
 
 
@@ -51,7 +48,7 @@
 class FuConstruct : public FuDraw
 {
  public:
-    FuConstruct(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstruct(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                    SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstruct();
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index d3d9102e5816..b5ff2bcce5e0 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuconuno.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,7 +47,7 @@ protected:
     UINT16 nIdentifier;
 
 public:
-    FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                        SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuConstUnoControl();
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index c7789b4cebe7..24355c3a8560 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fudraw.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,10 +32,7 @@
 #define SC_FUDRAW_HXX
 
 #include "fupoor.hxx"
-
-#ifndef _SV_POINTR_HXX //autogen
 #include <vcl/pointr.hxx>
-#endif
 
 /*************************************************************************
 |*
@@ -50,7 +47,7 @@ class FuDraw : public FuPoor
     Pointer aOldPointer;
 
  public:
-    FuDraw(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuDraw(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuDraw();
 
@@ -72,7 +69,6 @@ class FuDraw : public FuPoor
     virtual void SelectionHasChanged();
 
     BOOL IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
-    void CheckVisibleNote() const;
 
  private:
     void    DoModifiers(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx
index 22d9c8634359..e2cdedef73fc 100644
--- a/sc/source/ui/inc/fuedipo.hxx
+++ b/sc/source/ui/inc/fuedipo.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuedipo.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,9 +31,6 @@
 #ifndef SC_FUEDIPO_HXX
 #define SC_FUEDIPO_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fudraw.hxx"
 
 
@@ -46,7 +43,7 @@
 class FuEditPoints : public FuDraw
 {
  public:
-    FuEditPoints(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuEditPoints(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuEditPoints();
diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx
index 8e40de9aa470..bef04f585794 100644
--- a/sc/source/ui/inc/fuinsert.hxx
+++ b/sc/source/ui/inc/fuinsert.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuinsert.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,7 +37,7 @@
 class FuInsertGraphic : public FuPoor
 {
  public:
-    FuInsertGraphic( ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuInsertGraphic( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuInsertGraphic();
 
@@ -50,7 +50,7 @@ class FuInsertGraphic : public FuPoor
 class FuInsertOLE : public FuPoor
 {
  public:
-    FuInsertOLE( ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuInsertOLE( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuInsertOLE();
 
@@ -63,7 +63,7 @@ class FuInsertOLE : public FuPoor
 class FuInsertChart : public FuPoor
 {
  public:
-    FuInsertChart( ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuInsertChart( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuInsertChart();
 
@@ -76,7 +76,7 @@ class FuInsertChart : public FuPoor
 class FuInsertMedia : public FuPoor
 {
  public:
-    FuInsertMedia( ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuInsertMedia( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuInsertMedia();
 
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 61896f7b8d6b..8983154562a0 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fumark.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,7 +51,7 @@ class FuMarkRect : public FuPoor
     ScRangeListRef  aSourceRange;
 
  public:
-    FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuMarkRect();
 
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 819eb56aa367..8411b1a3fbfc 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fupoor.hxx,v $
- * $Revision: 1.7.146.1 $
+ * $Revision: 1.7.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,13 +31,11 @@
 #ifndef _SC_FUPOOR_HXX
 #define _SC_FUPOOR_HXX
 
-#ifndef _EVENT_HXX //autogen
 #include <vcl/event.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <sfx2/request.hxx>
 
-class SdrView;
+class ScDrawView;
 class ScTabViewShell;
 class Window;
 class SdrModel;
@@ -59,8 +57,8 @@ class SdrObject;
 
 class FuPoor
 {
- protected:
-    SdrView*        pView;
+protected:
+    ScDrawView*     pView;
     ScTabViewShell* pViewShell;
     Window*         pWindow;
     SdrModel*       pDrDoc;
@@ -83,8 +81,8 @@ class FuPoor
 private:
     sal_uInt16      mnCode;
 
- public:
-    FuPoor(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+public:
+    FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuPoor();
 
@@ -126,6 +124,7 @@ private:
 
     // #98185# Create default drawing objects via keyboard
     virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
+
 protected:
     void ImpForceQuadratic(Rectangle& rRect);
 
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index b8f2481d3802..c0366292a2c0 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fusel.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,17 +49,8 @@ class SdrPageView;
 
 class FuSelection : public FuDraw
 {
- protected:
-//  Outliner*       pOutliner;
-//  OutlinerView*   pOutlinerView;
-    BOOL            bVCAction;
-
- private:
-    BOOL TestDetective( SdrPageView* pPV, const Point& rPos );  // -> fusel2
-    BOOL TestComment( SdrPageView* pPV, const Point& rPos );    // -> fusel2
-
- public:
-    FuSelection(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+public:
+    FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
            SdrModel* pDoc, SfxRequest& rReq );
 
     virtual ~FuSelection();
@@ -73,7 +64,18 @@ class FuSelection : public FuDraw
     virtual void Activate();           // Function aktivieren
     virtual void Deactivate();         // Function deaktivieren
 
-    void    ActivateNoteHandles(SdrObject* pObj) const ;
+    void    ActivateNoteHandles(SdrObject* pObj);
+
+protected:
+//  Outliner*       pOutliner;
+//  OutlinerView*   pOutlinerView;
+    BOOL            bVCAction;
+
+private:
+    BOOL TestDetective( SdrPageView* pPV, const Point& rPos );  // -> fusel2
+
+    bool                IsNoteCaptionMarked() const;
+    bool                IsNoteCaptionClicked( const Point& rPos ) const;
 };
 
 
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 2f02a1075706..488b1ecf2508 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: futext.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,7 +49,7 @@ protected:
     SdrTextObj*     pTextObj;
 
 public:
-    FuText(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView,
+    FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
                    SdrModel* pDoc, SfxRequest& rReq);
 
     virtual ~FuText();
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 8a75f496c3d0..ccc173d299f5 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: notemark.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,6 +51,7 @@ private:
     ScDocument* pDoc;
     ScAddress   aDocPos;
     String      aUserText;
+    Rectangle   aVisRect;
     Timer       aTimer;
     MapMode     aMapMode;
     BOOL        bLeft;
@@ -64,11 +65,9 @@ private:
     DECL_LINK( TimeHdl, Timer* );
 
 public:
-                ScNoteMarker( Window* pWin,
-                                Window* pRight, Window* pBottom, Window* pDiagonal,
-                                ScDocument* pD, ScAddress aPos,
-                                const String& rUser, const MapMode& rMap,
-                                BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard );
+                ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal,
+                                ScDocument* pD, ScAddress aPos, const String& rUser,
+                                const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard );
                 ~ScNoteMarker();
 
     void        Draw();
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 15679ad7a6f3..2d3ee1d14dd7 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: undobase.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.128.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -100,12 +100,15 @@ class ScDBFuncUndo: public ScSimpleUndo
 {
     ScDBData*       pAutoDBRange;
     ScRange         aOriginalRange;
+    SdrUndoAction*  mpDrawUndo;
 
 public:
                     TYPEINFO();
-                    ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal );
+                    ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = 0 );
     virtual         ~ScDBFuncUndo();
 
+    void            SetDrawUndoAction( SdrUndoAction* pDrawUndo );
+
     void            BeginUndo();
     void            EndUndo();
     void            BeginRedo();
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 99f0c7b5f16a..d357461d0f5e 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: undoblk.hxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.128.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -450,7 +450,7 @@ public:
                     ScUndoMerge( ScDocShell* pNewDocShell,
                                  SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                  SCCOL nEndX,   SCROW nEndY,   SCTAB nEndZ,
-                                 BOOL bNewDoMerge, ScDocument* pNewUndoDoc = NULL );
+                                 bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo );
     virtual         ~ScUndoMerge();
 
     virtual void    Undo();
@@ -461,11 +461,12 @@ public:
     virtual String  GetComment() const;
 
 private:
-    ScRange         aRange;
-    BOOL            bDoMerge;               // Merge oder aufheben
-    ScDocument*     pUndoDoc;               // wenn Daten zusammengefasst
+    ScRange         maRange;
+    bool            mbMergeContents;        // Merge contents in Redo().
+    ScDocument*     mpUndoDoc;              // wenn Daten zusammengefasst
+    SdrUndoAction*  mpDrawUndo;
 
-    void            DoChange( const BOOL bUndo ) const;
+    void            DoChange( bool bUndo ) const;
 };
 
 
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 50b77729ddad..f6b218fdfb44 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: undocell.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.128.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -248,53 +248,73 @@ private:
     void            SetChangeTrack( ScBaseCell* pOldCell );
 };
 
+// ============================================================================
 
-class ScUndoNote: public ScSimpleUndo
+/** Undo action for inserting, removing, and replacing a cell note. */
+class ScUndoReplaceNote : public ScSimpleUndo
 {
 public:
                     TYPEINFO();
-                    ScUndoNote( ScDocShell* pNewDocShell,
-                                BOOL bShow, const ScAddress& rNewPos,
-                                SdrUndoAction* pDraw );
-    virtual         ~ScUndoNote();
+
+    /** Constructs an undo action for inserting or removing a cell note. */
+                    ScUndoReplaceNote(
+                        ScDocShell& rDocShell,
+                        const ScAddress& rPos,
+                        const ScNoteData& rNoteData,
+                        bool bInsert,
+                        SdrUndoAction* pDrawUndo );
+
+    /** Constructs an undo action for replacing a cell note with another. */
+                    ScUndoReplaceNote(
+                        ScDocShell& rDocShell,
+                        const ScAddress& rPos,
+                        const ScNoteData& rOldData,
+                        const ScNoteData& rNewData,
+                        SdrUndoAction* pDrawUndo );
+
+    virtual         ~ScUndoReplaceNote();
 
     virtual void    Undo();
     virtual void    Redo();
-    virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Repeat( SfxRepeatTarget& rTarget );
+    virtual BOOL    CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual String  GetComment() const;
 
 private:
-    BOOL            bIsShow;
-    ScAddress       aPos;
-    SdrUndoAction*  pDrawUndo;
+    void            DoInsertNote( const ScNoteData& rNoteData );
+    void            DoRemoveNote( const ScNoteData& rNoteData );
+
+private:
+    ScAddress       maPos;
+    ScNoteData      maOldData;
+    ScNoteData      maNewData;
+    SdrUndoAction*  mpDrawUndo;
 };
 
+// ============================================================================
 
-class ScUndoEditNote: public ScSimpleUndo
+/** Undo action for showing or hiding a cell note caption. */
+class ScUndoShowHideNote : public ScSimpleUndo
 {
 public:
                     TYPEINFO();
-                    ScUndoEditNote( ScDocShell* pNewDocShell,
-                                    const ScAddress& rNewPos,
-                                    const ScPostIt& rOld,
-                                    const ScPostIt& rNew );
-    virtual         ~ScUndoEditNote();
+                    ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow );
+    virtual         ~ScUndoShowHideNote();
 
     virtual void    Undo();
     virtual void    Redo();
-    virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual void    Repeat( SfxRepeatTarget& rTarget );
+    virtual BOOL    CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual String  GetComment() const;
 
 private:
-    ScAddress       aPos;
-    ScPostIt        aOldNote;
-    ScPostIt        aNewNote;
+    ScAddress       maPos;
+    bool            mbShown;
 };
 
+// ============================================================================
 
 class ScUndoDetective: public ScSimpleUndo
 {
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index b3a4af0b3aac..0759d1fe2893 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewfunc.hxx,v $
- * $Revision: 1.34.32.3 $
+ * $Revision: 1.34.128.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -99,7 +99,7 @@ public:
 
     void            EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
                                BOOL bRecord = TRUE, const EditTextObject* pData = NULL );
-    void            EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue );
+    void            EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue );
     void            EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData,
                                 BOOL bRecord = TRUE, BOOL bTestSimple = FALSE );
 
@@ -298,7 +298,9 @@ public:
     void            SetSelectionFrameLines( const SvxBorderLine* pLine,
                                             BOOL bColorOnly );
 
-    void            SetNote( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPostIt& rNote );
+    void            SetNoteText( const ScAddress& rPos, const String& rNoteText );
+    void            ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate );
+
 //UNUSED2008-05  void            DoSpellingChecker( BOOL bRecord = TRUE );
     void            DoHangulHanjaConversion( BOOL bRecord = TRUE );
     void            DoThesaurus( BOOL bRecord = TRUE );
@@ -321,9 +323,9 @@ public:
     void            DetectiveDelAll();
     void            DetectiveRefresh();
 
-    void            ShowNote();
+    void            ShowNote( bool bShow = true );
+    inline void     HideNote() { ShowNote( false ); }
     void            EditNote();
-    void            HideNote();
 
     void            ForgetFormatArea()      { bFormatValid = FALSE; }
     BOOL            SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );