INTEGRATION: CWS impresstables2 (1.87.8); FILE MERGED

2008/03/11 18:16:41 cl 1.87.8.11: RESYNC: (1.93-1.94); FILE MERGED
2007/12/01 19:25:47 cl 1.87.8.10: RESYNC: (1.92-1.93); FILE MERGED
2007/11/29 19:02:55 cl 1.87.8.9: #i68103# working on table templates
2007/10/12 01:03:02 cl 1.87.8.8: RESYNC: (1.91-1.92); FILE MERGED
2007/10/11 15:20:54 cl 1.87.8.7: #i68103# added undo for tables
2007/08/07 12:01:07 cl 1.87.8.6: fixed merge conflicts
2007/08/01 18:43:46 cl 1.87.8.5: RESYNC: (1.88-1.91); FILE MERGED
2007/07/27 11:52:43 cl 1.87.8.4: fixed linux build problems
2007/07/26 21:13:57 cl 1.87.8.3: #i68103# working on tables in draw
2007/04/12 20:37:00 cl 1.87.8.2: RESYNC: (1.87-1.88); FILE MERGED
2007/03/15 17:07:03 cl 1.87.8.1: #i68103# adding a shape for tables

svx/source/svdraw/svdobj.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdobj.cxx,v $
  *
- *  $Revision: 1.94 $
+ *  $Revision: 1.95 $
  *
- *  last change: $Author: kz $ $Date: 2008-03-07 14:47:54 $
+ *  last change: $Author: rt $ $Date: 2008-03-12 09:54:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -193,6 +193,8 @@
 #include <vcl/virdev.hxx>
 #endif
 
+#include "svx/svdotable.hxx"
+
 using namespace ::com::sun::star;
 
 // #104018# replace macros above with type-detecting methods
@@ -2801,6 +2803,10 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemov
 
 void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
+    // only allow graphic and presentation styles for shapes
+    if( pNewStyleSheet && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PARA) && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PAGE) )
+        return;
+
     GetProperties().SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
 }
 
@@ -3766,6 +3772,7 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
             case USHORT(OBJ_UNO        ): pObj=new SdrUnoObj(String());         break;
             case USHORT(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
             case USHORT(OBJ_MEDIA      ): pObj=new SdrMediaObj();               break;
+            case USHORT(OBJ_TABLE      ): pObj=new ::sdr::table::SdrTableObj(pModel);   break;
         }
     }