#i10000# problem with default initalizing (.NET 2003)

2 files changed, 39 insertions, 42 deletions

diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index cfccde6e81..1c21a2facc 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dp_gui.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-11 12:02:28 $
+ *  last change: $Author: obo $ $Date: 2004-06-15 11:18:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,7 +103,7 @@ struct DialogImpl :
 {
     static ResId getResId( USHORT id );
     static String getResourceString( USHORT id );
-    
+
     struct TreeListBoxImpl : public SvHeaderTabListBox
     {
         typedef ::std::list<
@@ -120,12 +120,12 @@ struct DialogImpl :
         SvLBoxEntry * addPackageNode(
             SvLBoxEntry * parentNode,
             css::uno::Reference<css::deployment::XPackage> const & xPackage );
-        
+
         DialogImpl * m_dialog;
         SvLBoxEntry * m_currentEntry;
         bool m_hiContrastMode;
         Timer m_timer;
-        
+
         String m_strEnabled;
         String m_strDisabled;
         String m_strUnknown;
@@ -134,12 +134,12 @@ struct DialogImpl :
         String m_strCtxEnable;
         String m_strCtxDisable;
         String m_strCtxExport;
-        
+
         Image m_defaultPackage;
         Image m_defaultPackage_hc;
         Image m_defaultPackageBundle;
         Image m_defaultPackageBundle_hc;
-        
+
         DECL_LINK( TimerHandler, Timer * );
         virtual void SelectHdl();
         virtual void DeselectHdl();
@@ -150,10 +150,10 @@ struct DialogImpl :
         virtual void DataChanged( DataChangedEvent const & evt );
         virtual PopupMenu * CreateContextMenu(void);
         virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
-        
+
         virtual ~TreeListBoxImpl();
         TreeListBoxImpl( Window * pParent, DialogImpl * dialog );
-        
+
         bool isFirstLevelChild( SvLBoxEntry * entry );
         ::rtl::OUString getContext( SvLBoxEntry * entry );
         css::uno::Reference<css::deployment::XPackage> getPackage(
@@ -161,20 +161,20 @@ struct DialogImpl :
         css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> >
         getSelectedPackages( bool onlyFirstLevel = false );
     };
-    
+
     typedef void (DialogImpl::* t_clickCallback)( USHORT id );
-    
+
     class ThreadedPushButton : public PushButton
     {
         oslThread m_thread;
         DialogImpl * m_dialog;
         t_clickCallback m_clickCallback;
         USHORT m_id;
-        
+
     public:
         /// called by ThreadedPushButton_callback only:
         void action();
-        
+
         virtual ~ThreadedPushButton();
         inline ThreadedPushButton(
             DialogImpl * dialog, t_clickCallback cb, USHORT id )
@@ -184,31 +184,31 @@ struct DialogImpl :
               m_clickCallback( cb ),
               m_id( id )
             {}
-        
+
         // Button
         virtual void Click();
     };
-    
+
     virtual BOOL Close();
     virtual void Resize();
     DECL_LINK( headbar_dragEnd, HeaderBar * );
-    
+
     void clickClose( USHORT id );
     void clickAdd( USHORT id );
     void clickRemove( USHORT id );
     void clickEnableDisable( USHORT id );
     void clickExport( USHORT id );
-    
+
     bool m_allowSharedLayerModification;
     void updateButtonStates();
-    
+
     void errbox( css::uno::Any const & exc );
-    
+
     css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
     css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPkgMgrFac;
     css::uno::Reference<css::frame::XDesktop> m_xDesktop;
     css::uno::Reference<css::ucb::XContent> m_xTdocRoot;
-    
+
     Size m_buttonSize;
     Size m_relatedSpace;
     Size m_unrelatedSpace;
@@ -216,7 +216,7 @@ struct DialogImpl :
     Size m_borderRightBottomSpace;
     long m_ftFontHeight;
     long m_descriptionYSpace;
-    
+
     String m_strAddPackages;
     String m_strAddingPackages;
     String m_strRemovingPackages;
@@ -225,23 +225,23 @@ struct DialogImpl :
     String m_strExportPackage;
     String m_strExportPackages;
     String m_strExportingPackages;
-    
+
     // controls:
     ::std::auto_ptr<FixedText> m_ftPackages;
     ::std::auto_ptr<Control> m_selectionBox;
     ::std::auto_ptr<HeaderBar> m_headerBar;
     ::std::auto_ptr<TreeListBoxImpl> m_treelb;
-    
+
     ::std::auto_ptr<ThreadedPushButton> m_addButton;
     ::std::auto_ptr<ThreadedPushButton> m_removeButton;
     ::std::auto_ptr<ThreadedPushButton> m_enableButton;
     ::std::auto_ptr<ThreadedPushButton> m_disableButton;
     ::std::auto_ptr<ThreadedPushButton> m_exportButton;
     ::std::auto_ptr<FixedLine> m_bottomLine;
-    
+
     ::std::auto_ptr<OKButton> m_closeButton;
     ::std::auto_ptr<HelpButton> m_helpButton;
-    
+
     DECL_STATIC_LINK( DialogImpl, destroyDialog, void * );
     static ::rtl::Reference<DialogImpl> s_dialog;
     virtual ~DialogImpl();
@@ -250,10 +250,8 @@ struct DialogImpl :
         css::uno::Reference< css::uno::XComponentContext > const & xContext );
     static ::rtl::Reference<DialogImpl> get(
         css::uno::Reference<css::uno::XComponentContext> const & xContext,
-        css::uno::Reference<css::awt::XWindow> const & xParent =
-        css::uno::Reference<css::awt::XWindow>(),
+        css::uno::Reference<css::awt::XWindow> const & xParent = 0,
         ::rtl::OUString const & view = ::rtl::OUString() );
-    
     // XEventListener
     virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
         throw (css::uno::RuntimeException);
diff --git a/desktop/source/deployment/gui/dp_gui_cmdenv.h b/desktop/source/deployment/gui/dp_gui_cmdenv.h
index a41e048019..a090626df9 100644
--- a/desktop/source/deployment/gui/dp_gui_cmdenv.h
+++ b/desktop/source/deployment/gui/dp_gui_cmdenv.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dp_gui_cmdenv.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-11 12:03:21 $
+ *  last change: $Author: obo $ $Date: 2004-06-15 11:19:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,7 +94,7 @@ class ProgressCommandEnv
     void updateProgress( ::rtl::OUString const & text = ::rtl::OUString() );
     css::uno::Reference<css::task::XAbortChannel> m_xAbortChannel;
     bool m_aborted;
-    
+
     struct ProgressDialog : public Dialog
     {
         struct CancelButtonImpl : public CancelButton
@@ -107,23 +107,23 @@ class ProgressCommandEnv
             virtual void Click();
         };
         friend struct CancelButtonImpl;
-        
+
         ProgressCommandEnv * m_cmdEnv;
         ::std::auto_ptr<FixedText> m_ftCurrentAction;
         ::std::auto_ptr<StatusBar> m_statusBar;
         ::std::auto_ptr<CancelButtonImpl> m_cancelButton;
-        
+
         ProgressDialog( ProgressCommandEnv * cmdEnv );
     };
     friend struct ProgressDialog;
     friend struct ProgressDialog::CancelButtonImpl;
-    
+
     ::std::auto_ptr<ProgressDialog> m_progressDialog;
     DECL_LINK( executeDialog, ::osl::Condition * );
-    
+
     void update_( css::uno::Any const & Status )
         throw (css::uno::RuntimeException);
-    
+
 public:
     virtual ~ProgressCommandEnv();
     inline ProgressCommandEnv( DialogImpl * mainDialog,
@@ -132,25 +132,24 @@ public:
           m_title( title ),
           m_aborted( false )
         {}
-    
+
     void showProgress( sal_Int32 progressSections );
     void progressSection(
         String const & text,
-        css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel =
-        css::uno::Reference<css::task::XAbortChannel>() );
+        css::uno::Reference< css::task::XAbortChannel > const & xAbortChannel = 0 );
     inline bool isAborted() const { return m_aborted; }
-    
+
     // XCommandEnvironment
     virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
     getInteractionHandler() throw (css::uno::RuntimeException);
     virtual css::uno::Reference<css::ucb::XProgressHandler >
     SAL_CALL getProgressHandler() throw (css::uno::RuntimeException);
-    
+
     // XInteractionHandler
     virtual void SAL_CALL handle(
         css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
         throw (css::uno::RuntimeException);
-    
+
     // XProgressHandler
     virtual void SAL_CALL push( css::uno::Any const & Status )
         throw (css::uno::RuntimeException);