#89793# Error:SdrObjList::Load()

7 files changed, 35 insertions, 37 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 3768ccb1c..4685cd504 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside3.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: tbe $ $Date: 2001-06-22 14:45:07 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,10 @@
 #include <propbrw.hxx>
 #endif
 
-#include <vcsbxdef.hxx>
+#ifndef _BASCTL_DLGEDDEF_HXX
+#include <dlgeddef.hxx>
+#endif
+
 #include <basobj.hxx>
 #include <iderdll.hxx>
 #include <basidesh.hxx>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 4d966d907..60fca0bef 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basobj3.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: tbe $ $Date: 2001-07-25 14:51:32 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,9 +104,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
 
-// In bastype3.cxx:
-USHORT GetDialogSbxId();
-
 #define LINE_SEP	0x0A
 
 //----------------------------------------------------------------------------
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 07add0150..3898a34bc 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bastype2.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tbe $ $Date: 2001-06-18 08:05:05 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,7 +94,6 @@ class SbModule;
 class SvLBoxEntry;
 class SbxVariable;
 
-USHORT GetDialogSbxId();
 
 class BasicTreeListBox : public SvTreeListBox
 {
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index c96c2131b..ca9d9d185 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bastype3.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: tbe $ $Date: 2001-07-04 13:37:14 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,7 @@
 
 #pragma hdrstop
 #define _SI_NOSBXCONTROLS
-#include <vcsbxdef.hxx>
+
 #include <svtools/sbx.hxx>
 #include <bastype2.hxx>
 #include <basobj.hxx>
@@ -85,13 +85,6 @@ SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 );
 
 SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
 
-USHORT GetDialogSbxId()
-{
-    // damit nicht ueberall si.hxx includet werden muss!
-    return SBXID_DIALOG;
-}
-
-
 
 void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 {
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index aa28cb22e..b6f995173 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlged.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: tbe $ $Date: 2001-07-10 11:31:03 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:06:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,9 @@
 #include <xmlscript/xmldlg_imexp.hxx>
 #endif
 
-#include "vcsbxdef.hxx"
+#ifndef _BASCTL_DLGEDDEF_HXX
+#include <dlgeddef.hxx>
+#endif
 
 
 using namespace comphelper;
@@ -607,7 +609,7 @@ void DlgEditor::SetInsertObj( USHORT eObj )
     eActObj = eObj;
     
     if( pSdrView )
-        pSdrView->SetCurrentObj( eActObj, VCSbxInventor );	
+        pSdrView->SetCurrentObj( eActObj, DlgInventor );	
 }
 
 //----------------------------------------------------------------------------
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index c469322a7..91e974b84 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedfac.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: tbe $ $Date: 2001-06-22 14:45:11 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:06:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,12 +68,14 @@
 #include "dlgedobj.hxx"
 #endif
 
+#ifndef _BASCTL_DLGEDDEF_HXX
+#include <dlgeddef.hxx>
+#endif
+
 #ifndef _BASCTL_PROPBRW_HXX
 #include "propbrw.hxx"
 #endif
 
-#include <vcsbxdef.hxx>
-
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
@@ -127,8 +129,8 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
         bNeedsInit = sal_False;
     }
     
-    if( (pObjFactory->nInventor == VCSbxInventor) &&
-        (pObjFactory->nIdentifier >= OBJ_DLG_CHECKBOX) &&
+    if( (pObjFactory->nInventor == DlgInventor) &&
+        (pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
         (pObjFactory->nIdentifier <= OBJ_DLG_VFIXEDLINE)    )
     {
         switch( pObjFactory->nIdentifier )
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 037bd147a..5c0c43718 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: tbe $ $Date: 2001-07-18 16:26:56 $
+ *  last change: $Author: tbe $ $Date: 2001-07-27 18:06:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,10 @@
 #include <vector>
 #include <algorithm>
 
+#ifndef _BASCTL_DLGEDDEF_HXX
+#include <dlgeddef.hxx>
+#endif
+
 #ifndef _BASCTL_DLGEDOBJ_HXX
 #include "dlgedobj.hxx"
 #endif
@@ -94,8 +98,6 @@
 #include <dlgresid.hrc>
 #endif
 
-#include "vcsbxdef.hxx"
-
 #ifndef _TOOLS_RESMGR_HXX
 #include <tools/resmgr.hxx>
 #endif
@@ -649,7 +651,7 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 sal_uInt32 DlgEdObj::GetObjInventor()   const
 {
-    return VCSbxInventor;
+    return DlgInventor;
 }
 
 //----------------------------------------------------------------------------
@@ -660,7 +662,7 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const
     
     if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDialogModel") ))
     {
-        return OBJ_DIALOG;
+        return OBJ_DLG_DIALOG;
     }
     else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ))
     {