diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 906a01fb556771d1bd92af4017858a0a5ed3a601 (patch) | |
| tree | 92546e83685055d801e66a11a5f012d8f78aefda /sc/source/ui/view/tabvwsh.cxx | |
| parent | 91f418099eccc7e1d15d7fcd9ebaea75cb69a716 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sc/source/ui/view/tabvwsh.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 1e647ce88780..4b0060c88c4d 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -96,17 +96,10 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() ); - - //<!--Added by PengYunQuan for Validity Cell Range Picker SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId()); - //-->Added by PengYunQuan for Validity Cell Range Picker } -<<<<<<< local -SFX_IMPL_VIEWFACTORY( ScTabViewShell ) -======= SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" ) ->>>>>>> other { SFX_VIEW_REGISTRATION(ScDocShell); } |