diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 08:30:26 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 08:30:26 +0000 |
commit | 20326dbd74a356f34a6552ef6305a50b6705908f (patch) | |
tree | a3c0093b8707ab37b3bb573218a90ef5e32801b0 /svx | |
parent | 92711db167be35d88da94623c49a3f60a68cc93c (diff) |
INTEGRATION: CWS impresstables2 (1.2.58); FILE MERGED
2007/12/01 19:24:57 cl 1.2.58.4: RESYNC: (1.5-1.6); FILE MERGED
2007/10/12 00:47:49 cl 1.2.58.3: RESYNC: (1.4-1.5); FILE MERGED
2007/08/01 16:54:14 cl 1.2.58.2: RESYNC: (1.2-1.4); FILE MERGED
2007/05/31 11:11:36 cl 1.2.58.1: #i68103# merging changes to moved header files for tables
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 9ccf44fb586e..7816d67c2a88 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: svdobj.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 14:48:43 $ + * last change: $Author: rt $ $Date: 2008-03-12 09:30:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -185,8 +185,9 @@ enum SdrObjKind {OBJ_NONE = 0, // Abstraktes Objekt (SdrObject) OBJ_DUMMY =30, // Dummyobjekt zum speichern von Luecken (zur anschliessenden Wiederherstellung der Surrogate) OBJ_FRAME =31, // staendig aktives OLE (PlugIn-Frame oder sowas) OBJ_UNO =32, // Universal Network Object im SvDraw-Obj eingepackt - OBJ_CUSTOMSHAPE =33, // CustomShape + OBJ_CUSTOMSHAPE=33, // CustomShape OBJ_MEDIA =34, // Media shape + OBJ_TABLE =35, // Table OBJ_MAXI}; // Paintmodes, die den SdrObject::Paint-Methoden mitgegeben werden. |