diff options
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index cda2832adb06..90a42345bb38 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -371,7 +371,7 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA // class ScConflictsDlg -ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) +ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, "ConflictsDialog", "modules/scalc/ui/conflictsdialog.ui" ) ,m_pLbConflictsContainer ( get<SvSimpleTableContainer>("container") ) ,m_pLbConflicts ( new SvxRedlinTable(*m_pLbConflictsContainer) ) |