INTEGRATION: CWS impresstables2 (1.2.58); FILE MERGED

2007/05/31 11:11:36 cl 1.2.58.1: #i68103# merging changes to moved header files for tables

2 files changed, 9 insertions, 8 deletions

diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 0a5c1d8a570c..1f90e526467c 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoprov.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:45:46 $
+ *  last change: $Author: rt $ $Date: 2008-03-12 09:33:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -111,8 +111,8 @@ public:
 #define SVXMAP_TEXT                 21
 #define SVXMAP_CUSTOMSHAPE          22
 #define SVXMAP_MEDIA                23
-#define SVXMAP_END                  24  // last+1 !
-
+#define SVXMAP_TABLE                24
+#define SVXMAP_END                  25  // last+1 !
 /***********************************************************************
 * SvxUnoPropertyMapProvider                                            *
 ***********************************************************************/
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index 44c34842610d..500995cf89ab 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoshtxt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:46:29 $
+ *  last change: $Author: rt $ $Date: 2008-03-12 09:34:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,18 +56,19 @@ class SdrModel;
 class SdrView;
 class Window;
 class SvxTextEditSourceImpl;
+class SdrText;
 
 class SVX_DLLPUBLIC SvxTextEditSource : public SvxEditSource, public SvxViewForwarder
 {
 public:
-    SvxTextEditSource( SdrObject* pObj, ::com::sun::star::uno::XInterface* pOwner);
+    SvxTextEditSource( SdrObject* pObj, SdrText* pText, ::com::sun::star::uno::XInterface* pOwner);
 
     /** Since the views don't broadcast their dying, make sure that
         this object gets destroyed if the view becomes invalid
 
         The window is necessary, since our views can display on multiple windows
      */
-    SvxTextEditSource( SdrObject& rObj, SdrView& rView, const Window& rViewWindow );
+    SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rViewWindow );
 
     virtual ~SvxTextEditSource();