Resolves: fdo#36534 rework SvxSimpleTable to not manage its own parent

4 files changed, 9 insertions, 32 deletions

diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 069e3cca4..69ef0a3e9 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -140,19 +140,6 @@ public:
 
 
 //=============================================================================
-// class ScConflictsListBox
-//=============================================================================
-
-class ScConflictsListBox: public SvxRedlinTable
-{
-private:
-
-public:
-                        ScConflictsListBox( Window* pParent, const ResId& rResId );
-                        ~ScConflictsListBox();
-};
-
-//=============================================================================
 // class ScConflictsDlg
 //=============================================================================
 
@@ -160,7 +147,8 @@ class ScConflictsDlg : public ModalDialog
 {
 private:
     FixedText           maFtConflicts;
-    ScConflictsListBox  maLbConflicts;
+    SvxSimpleTableContainer m_aLbConflictsContainer;
+    SvxRedlinTable      maLbConflicts;
     PushButton          maBtnKeepMine;
     PushButton          maBtnKeepOther;
     FixedLine           maFlConflicts;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 47ac9ceac..b29d6a7f5 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -49,6 +49,7 @@ private:
     FixedText           maFtWarning;
     FixedLine           maFlUsers;
     FixedText           maFtUsers;
+    SvxSimpleTableContainer m_aLbUsersContainer;
     SvxSimpleTable      maLbUsers;
     FixedLine           maFlEnd;
     HelpButton          maBtnHelp;
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 4013541e7..5deab780a 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -393,20 +393,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
     }
 }
 
-
-//=============================================================================
-// class ScConflictsListBox
-//=============================================================================
-
-ScConflictsListBox::ScConflictsListBox( Window* pParent, const ResId& rResId )
-    :SvxRedlinTable( pParent, rResId )
-{
-}
-
-ScConflictsListBox::~ScConflictsListBox()
-{
-}
-
 //=============================================================================
 // class ScConflictsDlg
 //=============================================================================
@@ -414,7 +400,8 @@ ScConflictsListBox::~ScConflictsListBox()
 ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList )
     :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) )
     ,maFtConflicts      ( this, ScResId( FT_CONFLICTS ) )
-    ,maLbConflicts      ( this, ScResId( LB_CONFLICTS ) )
+    ,m_aLbConflictsContainer(this, ScResId( LB_CONFLICTS))
+    ,maLbConflicts(m_aLbConflictsContainer)
     ,maBtnKeepMine      ( this, ScResId( BTN_KEEPMINE ) )
     ,maBtnKeepOther     ( this, ScResId( BTN_KEEPOTHER ) )
     ,maFlConflicts      ( this, ScResId( FL_CONFLICTS ) )
@@ -753,8 +740,8 @@ void ScConflictsDlg::Resize()
 
     lcl_ChangeControlWidth( maFtConflicts, nDeltaWidth );
 
-    lcl_ChangeControlWidth( maLbConflicts, nDeltaWidth );
-    lcl_ChangeControlHeight( maLbConflicts, nDeltaHeight );
+    lcl_ChangeControlWidth( m_aLbConflictsContainer, nDeltaWidth );
+    lcl_ChangeControlHeight( m_aLbConflictsContainer, nDeltaHeight );
 
     lcl_MoveControlX( maBtnKeepMine, nDeltaWidth / 2 );
     lcl_MoveControlY( maBtnKeepMine, nDeltaHeight );
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 8f294ec68..547336fe1 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -61,7 +61,8 @@ ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData )
     ,maFtWarning          ( this, ScResId( FT_WARNING ) )
     ,maFlUsers            ( this, ScResId( FL_USERS ) )
     ,maFtUsers            ( this, ScResId( FT_USERS ) )
-    ,maLbUsers            ( this, ScResId( LB_USERS ) )
+    ,m_aLbUsersContainer(this, ScResId(LB_USERS))
+    ,maLbUsers(m_aLbUsersContainer)
     ,maFlEnd              ( this, ScResId( FL_END ) )
     ,maBtnHelp            ( this, ScResId( BTN_HELP ) )
     ,maBtnOK              ( this, ScResId( BTN_OK ) )