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 | 5eb9ea76e2b0aa72c1bd00d7f0429cb0de3bb1da (patch) | |
| tree | 13cae60ce6fc9da6d413d0caa445759b221f3d7a /sw/source/ui/web/wview.cxx | |
| parent | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sw/source/ui/web/wview.cxx')
| -rw-r--r-- | sw/source/ui/web/wview.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index a45f9b3b22c0..d1e7fe672a38 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -93,16 +93,11 @@ #include <swslots.hxx> -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SwWebView) -======= SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") ->>>>>>> other { SFX_VIEW_REGISTRATION(SwWebDocShell); } - SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) { SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); |