diff options
Diffstat (limited to 'starmath/source/view.cxx')
| -rwxr-xr-x | starmath/source/view.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 20c235408013..c2756685d451 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -749,7 +749,11 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } +<<<<<<< local +SFX_IMPL_VIEWFACTORY(SmViewShell) +======= SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") +>>>>>>> other { SFX_VIEW_REGISTRATION(SmDocShell); } |