diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-14 14:24:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-14 14:24:29 +0100 |
| commit | 02039def0c087d6980ab6b5d1b8e78e5d5f0f16b (patch) | |
| tree | 74323364d6e23a0c71ac5c8247a216e99bab768e /sc/source/ui/miscdlgs/conflictsdlg.cxx | |
| parent | a76ca5325de1f22fbc17971286c2f5a7f711dc94 (diff) | |
Resolves: fdo#36534 rework SvxSimpleTable to not manage its own parent
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 335189759e69..564f75708656 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 ); |