code cleanup

basctl/source/dlged/dlgedobj.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: tbe $ $Date: 2001-03-20 14:37:07 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,22 +66,6 @@
 #include "dlgedobj.hxx"
 #endif
 
-#ifndef _TOOLS_RESMGR_HXX
-#include <tools/resmgr.hxx>
-#endif
-
-#ifndef _SVDIO_HXX //autogen
-#include <svx/svdio.hxx>
-#endif
-
-#ifndef _SHL_HXX
-#include <tools/shl.hxx>
-#endif
-
-#ifndef _SVX_FMGLOB_HXX
-#include <svx/fmglob.hxx>
-#endif
-
 #ifndef _BASCTL_DLGED_HXX
 #include "dlged.hxx"
 #endif
@@ -102,6 +86,28 @@
 #include "dlgedlist.hxx"
 #endif
 
+#ifndef _IDERID_HXX
+#include <iderid.hxx>
+#endif
+
+#ifndef _BASCTL_DLGRESID_HRC
+#include <dlgresid.hrc>
+#endif
+
+#include "vcsbxdef.hxx"
+
+#ifndef _TOOLS_RESMGR_HXX
+#include <tools/resmgr.hxx>
+#endif
+
+#ifndef _SVDIO_HXX //autogen
+#include <svx/svdio.hxx>
+#endif
+
+#ifndef _SHL_HXX
+#include <tools/shl.hxx>
+#endif
+
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
@@ -122,13 +128,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
 
-#include <iderid.hxx>
-
-#ifndef _BASCTL_DLGRESID_HRC
-#include <dlgresid.hrc>
-#endif
-
-#include "vcsbxdef.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -619,7 +618,6 @@ void DlgEdObj::UpdateStep()
 
 //----------------------------------------------------------------------------
 
-
 void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
 {
     // stop listening with all childs
@@ -697,7 +695,7 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 //----------------------------------------------------------------------------
 
-::rtl::OUString DlgEdObj::GetServiceName()
+::rtl::OUString DlgEdObj::GetServiceName() const
 {
     ::rtl::OUString aServiceName;
     Reference< lang::XServiceInfo > xServiceInfo( GetUnoControlModel() , UNO_QUERY );
@@ -714,7 +712,7 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 //----------------------------------------------------------------------------
 
-::rtl::OUString DlgEdObj::GetDefaultName()
+::rtl::OUString DlgEdObj::GetDefaultName() const
 {
     sal_uInt16 nResId = 0;
     ::rtl::OUString aDefaultName;
@@ -788,7 +786,7 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 //----------------------------------------------------------------------------
 
-::rtl::OUString DlgEdObj::GetUniqueName()
+::rtl::OUString DlgEdObj::GetUniqueName() const
 {
     ::rtl::OUString aUniqueName;
     uno::Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), uno::UNO_QUERY);
@@ -811,11 +809,6 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 sal_uInt32 DlgEdObj::GetObjInventor()   const
 {
-    /*
-    if( GetModel() && ((FmFormModel*)GetModel())->IsStreamingOldVersion() )
-        return SdrInventor;
-    return FmFormInventor;
-    */
     return VCSbxInventor;
 }
 
@@ -823,23 +816,63 @@ sal_uInt32 DlgEdObj::GetObjInventor()   const
 
 sal_uInt16 DlgEdObj::GetObjIdentifier() const
 {
-    /*
-    if( GetModel() && ((FmFormModel*)GetModel())->IsStreamingOldVersion() )
-        return OBJ_RECT;
-    return OBJ_FM_CONTROL;
-    */
-    return OBJ_FM_CONTROL;  // change this
+    ::rtl::OUString aServiceName = GetServiceName();
+
+    if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDialogModel") ))
+    {
+        return OBJ_DIALOG;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ))
+    {
+        return OBJ_DLG_PUSHBUTTON;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ))
+    {
+        return OBJ_DLG_RADIOBUTTON;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ))
+    {
+        return OBJ_DLG_CHECKBOX;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ))
+    {
+        return OBJ_DLG_LISTBOX;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ))
+    {
+        return OBJ_DLG_COMBOBOX;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ))
+    {
+        return OBJ_DLG_GROUPBOX;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlEditModel") ))
+    {
+        return OBJ_DLG_EDIT;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ))
+    {
+        return OBJ_DLG_FIXEDTEXT;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ))
+    {
+        return OBJ_DLG_PREVIEW;
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 //----------------------------------------------------------------------------
 
-void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
+void DlgEdObj::clonedFrom(const DlgEdObj* _pSource) // not working yet
 {
 }
 
 //----------------------------------------------------------------------------
 
-SdrObject* DlgEdObj::Clone() const
+SdrObject* DlgEdObj::Clone() const  // not working yet
 {
     SdrObject* pReturn = SdrUnoObj::Clone();
 
@@ -853,7 +886,7 @@ SdrObject* DlgEdObj::Clone() const
 
 //----------------------------------------------------------------------------
 
-SdrObject* DlgEdObj::Clone(SdrPage* _pPage, SdrModel* _pModel) const
+SdrObject* DlgEdObj::Clone(SdrPage* _pPage, SdrModel* _pModel) const // not working yet
 {
     SdrObject* pReturn = SdrUnoObj::Clone(_pPage, _pModel);
     if (!pReturn)
@@ -864,7 +897,7 @@ SdrObject* DlgEdObj::Clone(SdrPage* _pPage, SdrModel* _pModel) const
 
 //----------------------------------------------------------------------------
 
-void DlgEdObj::operator= (const SdrObject& rObj)
+void DlgEdObj::operator= (const SdrObject& rObj)    // not working yet
 {
     SdrUnoObj::operator= (rObj);
 
@@ -872,25 +905,14 @@ void DlgEdObj::operator= (const SdrObject& rObj)
 
 //----------------------------------------------------------------------------
 
-void DlgEdObj::WriteData(SvStream& rOut) const
+void DlgEdObj::WriteData(SvStream& rOut) const  // not working yet
 {
-    /*
-    FmFormModel* pModel = (FmFormModel*)GetModel();
-    if( pModel && pModel->IsStreamingOldVersion() )
-    {
-        SdrLayerID nOld = GetLayer();
-        ((FmFormObj*)this)->NbcSetLayer( pModel->GetControlExportLayerId( *this ) );
-        SdrUnoObj::WriteData( rOut );
-        ((FmFormObj*)this)->NbcSetLayer( nOld );
-        return;
-    }
-    */
     SdrUnoObj::WriteData(rOut);
 }
 
 //----------------------------------------------------------------------------
 
-void DlgEdObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
+void DlgEdObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn) // not working yet
 {
     SdrUnoObj::ReadData(rHead,rIn);
 }
@@ -921,7 +943,7 @@ FASTBOOL DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     EndListening(sal_False);
 
     // set parent form
-    pDlgEdForm = ((DlgEdPage*)GetPage())->GetDlgEd()->GetDlgEdForm();
+    pDlgEdForm = ((DlgEdPage*)GetPage())->GetDlgEdForm();
 
     // add child to parent form
     pDlgEdForm->AddChild(this);
@@ -1337,9 +1359,18 @@ FASTBOOL DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     sal_Bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
 
+    // stop listening
+    EndListening(sal_False);
+
     // set geometry properties
     SetPropsFromRect();
 
+    // dialog model changed
+    GetDlgEditor()->SetDialogModelChanged(TRUE);
+
+    // start listening
+    StartListening();
+
     return bResult;
 }
 

basctl/source/dlged/dlgedview.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedview.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tbe $ $Date: 2001-02-26 10:48:56 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:14:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,41 +59,18 @@
  *
  ************************************************************************/
 
-#ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
-#endif
 
-#ifndef _SVDVIEW_HXX //autogen
-#include <svx/svdview.hxx>
+#ifndef _BASCTL_DLGEDVIEW_HXX
+#include "dlgedview.hxx"
 #endif
 
-#pragma hdrstop
-
-#include <svx/svdobj.hxx>
-
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
+
 #ifndef _SFXVIEWFRM_HXX
 #include <sfx2/viewfrm.hxx>
 #endif
-#include <svx/svdlayer.hxx>
-
-#ifndef _BASCTL_DLGED_HXX
-#include "dlged.hxx"
-#endif
-
-#ifndef _BASCTL_DLGEDFUNC_HXX
-#include "dlgedfunc.hxx"
-#endif
-
-#ifndef _BASCTL_DLGEDFAC_HXX
-#include "dlgedfac.hxx"
-#endif
-
-#ifndef _BASCTL_DLGEDVIEW_HXX
-#include "dlgedview.hxx"
-#endif
 
 #ifndef _BASCTL_PROPBRW_HXX
 #include "propbrw.hxx"

basctl/source/dlged/propbrw.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propbrw.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tbe $ $Date: 2001-03-16 13:40:30 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,22 +59,73 @@
  *
  ************************************************************************/
 
+
+#ifndef _BASCTL_PROPBRW_HXX
+#include "propbrw.hxx"
+#endif
+
+#ifndef _BASCTL_DLGEDOBJ_HXX
+#include "dlgedobj.hxx"
+#endif
+
+#include "basidesh.hxx"
+
+#ifndef _IDERID_HXX
+#include <iderid.hxx>
+#endif
+
+#ifndef _BASCTL_DLGRESID_HRC
+#include <dlgresid.hrc>
+#endif
+
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
+
 #ifndef _SFX_BINDINGS_HXX
 #include <sfx2/bindings.hxx>
 #endif
+
 #ifndef _SFX_CHILDWIN_HXX
 #include <sfx2/childwin.hxx>
 #endif
+
 #ifndef _SFX_OBJITEM_HXX
 #include <sfx2/objitem.hxx>
 #endif
+
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
 
+#ifndef _SHL_HXX
+#include <tools/shl.hxx>
+#endif
+
+#ifndef _VCL_STDTEXT_HXX
+#include <vcl/stdtext.hxx>
+#endif
+
+#ifndef _SVDVIEW_HXX //autogen
+#include <svx/svdview.hxx>
+#endif
+
+#ifndef _SVDOGRP_HXX
+#include <svx/svdogrp.hxx>
+#endif
+
+#ifndef _SVDPAGE_HXX
+#include <svx/svdpage.hxx>
+#endif
+
+#ifndef _SVDITER_HXX
+#include <svx/svditer.hxx>
+#endif
+
+#ifndef _SFXVIEWSH_HXX //autogen
+#include <sfx2/viewsh.hxx>
+#endif
+
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
@@ -111,48 +162,6 @@
 #include <comphelper/processfactory.hxx>
 #endif
 
-#ifndef _SHL_HXX
-#include <tools/shl.hxx>
-#endif
-#ifndef _SVX_DIALMGR_HXX //autogen
-#include <svx/dialmgr.hxx>
-#endif
-#ifndef _VCL_STDTEXT_HXX
-#include <vcl/stdtext.hxx>
-#endif
-
-#ifndef _SVDVIEW_HXX //autogen
-#include <svx/svdview.hxx>
-#endif
-
-#ifndef _SVDOGRP_HXX
-#include <svx/svdogrp.hxx>
-#endif
-#ifndef _SVDPAGE_HXX
-#include <svx/svdpage.hxx>
-#endif
-#ifndef _SVDITER_HXX
-#include <svx/svditer.hxx>
-#endif
-
-#ifndef _SFXVIEWSH_HXX //autogen
-#include <sfx2/viewsh.hxx>
-#endif
-
-#ifndef _BASCTL_DLGEDOBJ_HXX
-#include "dlgedobj.hxx"
-#endif
-
-#ifndef _BASCTL_PROPBRW_HXX
-#include "propbrw.hxx"
-#endif
-
-#include "basidesh.hxx"
-#include <iderid.hxx>
-
-#ifndef _BASCTL_DLGRESID_HRC
-#include <dlgresid.hrc>
-#endif
 
 //============================================================================
 // PropBrwMgr

basctl/source/inc/dlgedobj.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: tbe $ $Date: 2001-03-20 14:34:45 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,8 +88,8 @@ class DlgEdForm;
 
 class DlgEdObj: public SdrUnoObj
 {
-    friend class VCDlgEditor;
-    friend class VCDlgEditFactory;
+    friend class DlgEditor;
+    friend class DlgEdFactory;
     friend class DlgEdPropListenerImpl;
     friend class DlgEdForm;
 
@@ -99,62 +99,56 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener;
 
-public:
-    TYPEINFO();
-
 protected:
     DlgEdObj();
     DlgEdObj(const ::rtl::OUString& rModelName);
     DlgEdObj(const ::rtl::OUString& rModelName,
              const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac);
 
+    virtual void     WriteData(SvStream& rOut) const;                           // not working yet
+    virtual void     ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);      // not working yet
+
+    virtual void NbcMove( const Size& rSize );
+    virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
+    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+
+    DECL_LINK(OnCreate, void* );
+
+    void StartListening();
+    void EndListening(sal_Bool bRemoveListener = sal_True);
+    sal_Bool    isListening() const { return bIsListening; }
+
 public:
+    TYPEINFO();
+
     virtual ~DlgEdObj();
     virtual void SetPage(SdrPage* pNewPage);
 
     virtual void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
     virtual DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
 
-    virtual void SetRectFromProps();
-    virtual void SetPropsFromRect();
-    virtual void SAL_CALL NameChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
-
-    virtual sal_Int32   GetStep() const;
-    virtual void        SetStep( sal_Int32 nStep );
-    virtual void        UpdateStep();
-
-    virtual void SAL_CALL TabIndexChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
-
-    ::rtl::OUString GetServiceName();
-    ::rtl::OUString GetDefaultName();
-    ::rtl::OUString GetUniqueName();
-
     virtual sal_uInt32 GetObjInventor() const;
     virtual sal_uInt16 GetObjIdentifier() const;
 
-    virtual SdrObject*  Clone() const;
-    virtual SdrObject*  Clone(SdrPage* pPage, SdrModel* pModel) const;
-    virtual void        operator= (const SdrObject& rObj);
-
-    virtual void clonedFrom(const DlgEdObj* _pSource);
+    virtual SdrObject*  Clone() const;                                          // not working yet
+    virtual SdrObject*  Clone(SdrPage* pPage, SdrModel* pModel) const;          // not working yet
+    virtual void        operator= (const SdrObject& rObj);                      // not working yet
+    virtual void clonedFrom(const DlgEdObj* _pSource);                          // not working yet
 
-protected:
-    virtual void     WriteData(SvStream& rOut) const;
-    virtual void     ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
+    virtual ::rtl::OUString GetServiceName() const;
+    virtual ::rtl::OUString GetDefaultName() const;
+    virtual ::rtl::OUString GetUniqueName() const;
 
-    virtual void NbcMove( const Size& rSize );
-    virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+    virtual sal_Int32   GetStep() const;
+    virtual void        SetStep( sal_Int32 nStep );
+    virtual void        UpdateStep();
 
-    DECL_LINK(OnCreate, void* );
+    virtual void SetRectFromProps();
+    virtual void SetPropsFromRect();
 
-    // start listening
-    void StartListening();
-    // end listening
-    void EndListening(sal_Bool bRemoveListener = sal_True);
-    sal_Bool    isListening() const { return bIsListening; }
+    virtual void SAL_CALL NameChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL TabIndexChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
 
-public:
     // PropertyChangeListener
     virtual void SAL_CALL _propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -171,26 +165,28 @@ public:
 
 class DlgEdForm: public DlgEdObj
 {
-    friend class VCDlgEditor;
-    friend class VCDlgEditFactory;
+    friend class DlgEditor;
+    friend class DlgEdFactory;
 
 private:
-    VCDlgEditor* pDlgEditor;
+    DlgEditor* pDlgEditor;
     ::std::vector<DlgEdObj*> pChilds;
 
-public:
-    TYPEINFO();
-
 protected:
     DlgEdForm(const ::rtl::OUString& rModelName);
     DlgEdForm(const ::rtl::OUString& rModelName,
               const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac);
     DlgEdForm();
 
+    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+
 public:
+    TYPEINFO();
+
     virtual ~DlgEdForm();
-    virtual void SetDlgEditor( VCDlgEditor* pEditor ) { pDlgEditor = pEditor; }
-    virtual VCDlgEditor* GetDlgEditor() const { return pDlgEditor; }
+
+    virtual void SetDlgEditor( DlgEditor* pEditor ) { pDlgEditor = pEditor; }
+    virtual DlgEditor* GetDlgEditor() const { return pDlgEditor; }
 
     virtual void AddChild( DlgEdObj* pDlgEdObj );
     virtual void RemoveChild( DlgEdObj* pDlgEdObj );
@@ -200,10 +196,6 @@ public:
     virtual void SortByTabIndex();
 
     virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const;
-
-protected:
-    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
-
 };
 
 #endif // _BASCTL_DLGEDOBJ_HXX

basctl/source/inc/dlgedview.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedview.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tbe $ $Date: 2001-02-26 11:09:18 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:15:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,25 +59,14 @@
  *
  ************************************************************************/
 
+
 #ifndef _BASCTL_DLGEDVIEW_HXX
 #define _BASCTL_DLGEDVIEW_HXX
 
-#ifndef _SVDVIEW_HXX //autogen
+#ifndef _SVDVIEW_HXX
 #include <svx/svdview.hxx>
 #endif
-#ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
-#endif
-
-#pragma hdrstop
 
-#ifndef _SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SFXVIEWFRM_HXX
-#include <sfx2/viewfrm.hxx>
-#endif
-#include <svx/svdlayer.hxx>
 
 //============================================================================
 // DlgEdView
@@ -96,4 +85,3 @@ public:
 };
 
 #endif //_BASCTL_DLGEDVIEW_HXX
-

basctl/source/inc/propbrw.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propbrw.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tbe $ $Date: 2001-03-16 13:40:42 $
+ *  last change: $Author: tbe $ $Date: 2001-03-23 16:16:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,12 +65,15 @@
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
+
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
+
 #ifndef _COM_SUN_STAR_AWT_XCONTROLCONTAINER_HPP_
 #include <com/sun/star/awt/XControlContainer.hpp>
 #endif
+
 #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
 #endif
@@ -82,12 +85,15 @@
 #ifndef _BASEDLGS_HXX
 #include <sfx2/basedlgs.hxx>
 #endif
+
 #ifndef _SFXBRDCST_HXX //autogen
 #include <svtools/brdcst.hxx>
 #endif
+
 #ifndef _SFXLSTNER_HXX //autogen
 #include <svtools/lstner.hxx>
 #endif
+
 #ifndef _SFX_CHILDWIN_HXX
 #include <sfx2/childwin.hxx>
 #endif
@@ -120,6 +126,7 @@ class SdrView;
 
 class PropBrw : public SfxFloatingWindow , public SfxListener, public SfxBroadcaster
 {
+private:
     sal_Bool        m_bInitialStateChange;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >