INTEGRATION: CWS docking4 (1.2.124); FILE MERGED

2004/10/07 11:20:35 toconnor 1.2.124.6: #i33338# remove SfxObjectShell dependency from Events tab
2004/10/05 15:15:59 toconnor 1.2.124.5: #i33338# only get help text when need to display it
2004/09/28 15:35:19 toconnor 1.2.124.4: #i33338# remove SvxViewFrame dependency which causes crash in db app
2004/09/20 15:18:39 cd 1.2.124.3: RESYNC: (1.3-1.4); FILE MERGED
2004/08/23 13:42:56 cd 1.2.124.2: RESYNC: (1.2-1.3); FILE MERGED
2004/08/16 15:58:39 toconnor 1.2.124.1: #i32100# - reset button in toolbars tab should reset all toolbars
#i32083# - placeholder string in messagebox not being replaced
#i32937# - fix typo in resource file

1 files changed, 15 insertions, 11 deletions

diff --git a/svx/source/dialog/cfg.hxx b/svx/source/dialog/cfg.hxx
index 853306d35b08..a6ba71da8a95 100644
--- a/svx/source/dialog/cfg.hxx
+++ b/svx/source/dialog/cfg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obo $ $Date: 2004-09-09 15:39:36 $
+ *  last change: $Author: obo $ $Date: 2004-11-16 14:27:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,7 +140,7 @@ typedef std::vector< SvxConfigEntry* > SvxEntries;
 class SvxConfigDialog : public SfxTabDialog
 {
 public:
-    SvxConfigDialog( Window*, const SfxItemSet*, SfxViewFrame* pFrame );
+    SvxConfigDialog( Window*, const SfxItemSet* );
     ~SvxConfigDialog();
 
     void                        ActivateTabPage( USHORT );
@@ -311,11 +311,13 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
 
-    SvxConfigEntry( USHORT nInitId, const String& rInitStr,
-                    const String& rHelpText, bool bPopup = FALSE );
+    SvxConfigEntry( const ::rtl::OUString& rDisplayName,
+                    const ::rtl::OUString& rCommandURL,
+                    bool bPopup = FALSE );
 
     SvxConfigEntry()
-        :   nId( 0 ),
+        :
+            nId( 0 ),
             bPopUp( FALSE ),
             bIsUserDefined( FALSE ),
             bIsMain( FALSE ),
@@ -327,9 +329,6 @@ public:
 
     ~SvxConfigEntry();
 
-    USHORT  GetId() const { return nId; }
-    void    SetId( USHORT nNew );
-
     const ::rtl::OUString&      GetCommand() const { return aCommand; }
     void    SetCommand( const String& rCmd ) { aCommand = rCmd; }
 
@@ -337,7 +336,7 @@ public:
     void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
     bool    HasChangedName() const { return bStrEdited; }
 
-    const ::rtl::OUString&      GetHelpText() const { return aHelpText; }
+    const ::rtl::OUString&      GetHelpText() ;
     void    SetHelpText( const String& rStr ) { aHelpText = rStr; }
 
     const ::rtl::OUString&      GetHelpURL() const { return aHelpURL; }
@@ -349,7 +348,7 @@ public:
     void    SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
     bool    IsUserDefined() const { return bIsUserDefined; }
 
-    bool    IsBinding() const { return nId != 0 && !bPopUp; }
+    bool    IsBinding() const { return !bPopUp; }
     bool    IsSeparator() const { return nId == 0; }
 
     SvxEntries* GetEntries() const { return pEntries; }
@@ -464,6 +463,9 @@ protected:
     // the ResourceURL to select when opening the dialog
     rtl::OUString                       m_aURLToSelect;
 
+    ::com::sun::star::uno::Reference
+        < ::com::sun::star::frame::XFrame > m_xFrame;
+
     SvxConfigPage( Window*, /* const ResId&, */ const SfxItemSet& );
     virtual ~SvxConfigPage();
 
@@ -498,6 +500,8 @@ protected:
 
 public:
 
+    static bool     CanConfig( const ::rtl::OUString& rModuleId );
+
     SaveInData*     GetSaveInData() { return pCurrentSaveInData; }
 
     SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,