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, 12 insertions, 11 deletions

diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 8d155823e955..3907f3d20967 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: notesuno.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.128.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,6 +46,7 @@
 
 class ScDocShell;
 class SvxUnoText;
+class ScPostIt;
 
 
 class ScAnnotationObj : public cppu::WeakImplHelper5<
@@ -56,14 +57,6 @@ class ScAnnotationObj : public cppu::WeakImplHelper5<
                             com::sun::star::lang::XServiceInfo >,
                         public SfxListener
 {
-private:
-    ScDocShell*             pDocShell;
-    ScAddress               aCellPos;
-    SvxUnoText*             pUnoText;
-
-private:
-    SvxUnoText& GetUnoText();
-
 public:
                             ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos);
     virtual                 ~ScAnnotationObj();
@@ -127,6 +120,16 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
                                 throw(::com::sun::star::uno::RuntimeException);
+
+private:
+    SvxUnoText&         GetUnoText();
+
+    const ScPostIt*     ImplGetNote() const;
+
+private:
+    ScDocShell*             pDocShell;
+    ScAddress               aCellPos;
+    SvxUnoText*             pUnoText;
 };
 
 class ScAnnotationShapeObj : public cppu::WeakImplHelper10<
@@ -151,8 +154,6 @@ private:
 private:
     SvxUnoText& GetUnoText();
     com::sun::star::uno::Reference < com::sun::star::drawing::XShape > GetXShape();
-    SdrObject* GetCaptionObj();
-    void UpdateData();
 
 public:
                             ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress& rPos);