CWS gnumake2: resolve conflicts and make sources buildable on Linux

2 files changed, 0 insertions, 82 deletions

diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 804da5671b7c..bef6d0bec106 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1743,77 +1743,6 @@ String RID_ERR_RIGHTEXPECTED
     Text [ en-US ] = "'RIGHT' expected" ;
 };
 
-<<<<<<< local
-ToolBox RID_MATH_TOOLBOX
-{
-    HelpId = RID_MATH_TOOLBOX ;
-    Customize = TRUE ;
-    LineSpacing = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Scroll = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Align = BOXALIGN_LEFT ;
-    Size = MAP_APPFONT ( 0 , 0 ) ;
-    MenuStrings = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOMIN ;
-            HelpID = SID_ZOOMIN ;
-            Text [ en-US ] = "Zoom In" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOMOUT ;
-            HelpID = SID_ZOOMOUT ;
-            Text [ en-US ] = "Zoom Out" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_VIEW100 ;
-            HelpID = SID_VIEW100 ;
-            Text [ en-US ] = "Zoom 100%" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ADJUST ;
-            HelpID = SID_ADJUST ;
-            Text [ en-US ] = "Entire Formula" ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_DRAW ;
-            HelpID = SID_DRAW ;
-            Text [ en-US ] = "Refresh" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FORMULACURSOR ;
-            HelpID = SID_FORMULACURSOR ;
-            Text [ en-US ] = "Formula Cursor";
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SYMBOLS_CATALOGUE ;
-            HelpID = SID_SYMBOLS_CATALOGUE ;
-            Text [ en-US ] = "Symbols" ;
-        };
-    };
-};
-
-=======
->>>>>>> other
 String RID_MATH_TOOLBOX
 {
     Text [ en-US ] = "Main Toolbar" ;
@@ -1838,9 +1767,6 @@ StringArray RID_PRINTUIOPTIONS
         < "Adjusts the formula to the page format used in the printout."; >;
         < "~Scaling"; >;
         < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >;
-//        < "Miscellaneous options"; >;
-//        < "Ig~nore ~~ and ` at the end of the line"; >;
-//        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
     };
 };
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c2756685d451..748e62e3536e 100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -738,10 +738,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
                                 SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
                                 SmResId(RID_MATH_TOOLBOX ));
-    //Dummy-Objectbar, damit es bei aktivieren nicht staendig zuppelt.
-// Wegen #58705# entfernt (RID wurde nirgends verwendet)
-//  SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_SERVER,
-//                              SmResId(RID_DRAW_OBJECTBAR) );
 
     SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
     SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId());
@@ -749,11 +745,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
 }
 
 
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SmViewShell)
-=======
 SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default")
->>>>>>> other
 {
     SFX_VIEW_REGISTRATION(SmDocShell);
 }