diff options
Diffstat (limited to 'sw/source/ui/uiview/view0.cxx')
| -rw-r--r-- | sw/source/ui/uiview/view0.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index f7a12cc1b0be..fbe59d286eec 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -105,7 +105,11 @@ using ::rtl::OUString; #include <unomid.h> +<<<<<<< local SFX_IMPL_VIEWFACTORY(SwView) +======= +SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") +>>>>>>> other { if ( SvtModuleOptions().IsWriter() ) { |