CWS gnumake2: resolve conflicts and make sources buildable on Linux

2010-10-29 15:36:30 +02:00
parent 0fe045d956
commit 5eb9ea76e2
15 changed files with 32 additions and 622 deletions
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -125,18 +125,11 @@ using ::com::sun::star::util::SearchOptions;
 #define BMARGPRN        1000
 #define BORDERPRN       300

-
-
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SwSrcView)
-=======
 SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
->>>>>>> other
 {
    SFX_VIEW_REGISTRATION(SwWebDocShell);
 }

-
 SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
 {
    SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));