diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 13:49:11 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 13:49:11 +0100 |
| commit | cbddc0a030fb9fa548571210fb81c7d64e916cb1 (patch) | |
| tree | 7061dc2096cd993016396d09a6ca3d68c95f6ed3 /sc/source/ui/miscdlgs/conflictsdlg.cxx | |
| parent | 24a94d9d539be238fc60bdd13a1da20e6f9feb20 (diff) | |
| parent | 50b023a94b59bedf747e1c16e829b8a28d1842a8 (diff) | |
Merge commit 'ooo/OOO330_m13'
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index ef525d6d8447..de40dd9d1868 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -37,7 +37,7 @@ #include "conflictsdlg.hrc" #include "scresid.hxx" #include "viewdata.hxx" -#include "tabview.hxx" +#include "dbfunc.hxx" //============================================================================= @@ -625,7 +625,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) return 0; } - ScTabView* pTabView = reinterpret_cast< ScTabView* >( mpViewData->GetView() ); + ScTabView* pTabView = mpViewData->GetView(); pTabView->DoneBlockMode(); BOOL bContMark = FALSE; SvLBoxEntry* pEntry = maLbConflicts.FirstSelected(); |