summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 18:42:16 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 18:42:16 +0000
commit5b1f487b6b91b78a4895604e9909ae756eca72cb (patch)
tree727db8202ed69de8b28859aa5a1b85f51e256f21 /svx
parent089ddfdb7444d3cb9e459afbd7e4348f3748efef (diff)
INTEGRATION: CWS dialogdiet (1.58.188); FILE MERGED
2004/01/19 20:37:00 mba 1.58.188.3: RESYNC: (1.59-1.60); FILE MERGED 2003/12/01 17:05:56 mba 1.58.188.2: RESYNC: (1.58-1.59); FILE MERGED 2003/11/28 17:52:33 mba 1.58.188.1: #i22972#: no inline factory
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdobj.cxx26
1 files changed, 24 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f4ace0006a9f..b5a8a60af041 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdobj.cxx,v $
*
- * $Revision: 1.60 $
+ * $Revision: 1.61 $
*
- * last change: $Author: vg $ $Date: 2004-01-06 15:41:45 $
+ * last change: $Author: hr $ $Date: 2004-02-03 19:42:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -5012,6 +5012,28 @@ sal_Bool SdrObject::IsMasterPageBackgroundObject() const
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
+{
+ nInventor=nInvent;
+ nIdentifier=nIdent;
+ pNewObj=NULL;
+ pPage=pNewPage;
+ pModel=pNewModel;
+ pObj=NULL;
+ pNewData=NULL;
+}
+
+SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+{
+ nInventor=nInvent;
+ nIdentifier=nIdent;
+ pNewObj=NULL;
+ pPage=NULL;
+ pModel=NULL;
+ pObj=pObj1;
+ pNewData=NULL;
+}
+
SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel)
{
if(pModel == NULL && pPage != NULL)