CWS gnumake4: convert starmath to new build system

17 files changed, 341 insertions, 784 deletions

diff --git a/starmath/sdi/makefile.mk b/starmath/AllLangResTarget_sm.mk
index a2d965bc2275..61ca79f57923 100644
--- a/starmath/sdi/makefile.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,34 +25,24 @@
 #
 #*************************************************************************
 
-PRJ=..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sm))
 
-PRJNAME=starmath
-TARGET=smslots
-SDI1EXPORT=smath
-SVSDIINC=$(PRJ)$/inc
+$(eval $(call gb_AllLangResTarget_add_srs,sm,\
+	sm/res \
+))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath))
 
-.INCLUDE :  settings.mk
-.IF "$(L10N_framework)"==""
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,sm/res))
 
+$(eval $(call gb_SrsTarget_set_include,sm/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/starmath/inc \
+))
 
-SDI1NAME=$(TARGET)
-
-SVSDI1DEPEND= \
-        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
-        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
-        $(SOLARINCXDIR)$/svx/svx.sdi \
-        $(SOLARINCXDIR)$/svx/svxitems.sdi \
-        $(SOLARINCXDIR)$/svx/xoitems.sdi \
-        smath.sdi \
-    smslots.sdi \
-    $(SVSDIINC)$/starmath.hrc
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-
-.INCLUDE :  target.mk
-
+$(eval $(call gb_SrsTarget_add_files,sm/res,\
+	starmath/source/commands.src \
+	starmath/source/smres.src \
+	starmath/source/symbol.src \
+	starmath/source/toolbox.src \
+))
diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
new file mode 100644
index 000000000000..6a98bbf680e8
--- /dev/null
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,sm_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \
+	-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sm_unoapi,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,sm_unoapi,\
+	starmath/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
+	org.openoffice.sw.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
new file mode 100644
index 000000000000..be2fecfd4c26
--- /dev/null
+++ b/starmath/Library_sm.mk
@@ -0,0 +1,108 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sm))
+
+$(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
+
+$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+
+$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
+
+$(eval $(call gb_Library_set_include,sm,\
+	-I$(SRCDIR)/starmath/inc/pch \
+	-I$(SRCDIR)/starmath/inc \
+	-I$(WORKDIR)/SdiTarget/starmath/sdi \
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,sm,\
+	$$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sm,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	editeng \
+	i18npaper \
+	sal \
+	sfx \
+	sot \
+	stl \
+	svl \
+	svt \
+	svx \
+	svxcore \
+	tk \
+	tl \
+	utl \
+	vcl \
+	xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sm,\
+	starmath/source/accessibility \
+	starmath/source/action \
+	starmath/source/cfgitem \
+	starmath/source/config \
+	starmath/source/dialog \
+	starmath/source/document \
+	starmath/source/edit \
+	starmath/source/eqnolefilehdr \
+	starmath/source/format \
+	starmath/source/mathmlexport \
+	starmath/source/mathmlimport \
+	starmath/source/mathtype \
+	starmath/source/node \
+	starmath/source/parse \
+	starmath/source/rect \
+	starmath/source/register \
+	starmath/source/smdll \
+	starmath/source/smmod \
+	starmath/source/symbol \
+	starmath/source/toolbox \
+	starmath/source/typemap \
+	starmath/source/types \
+	starmath/source/unodoc \
+	starmath/source/unomodel \
+	starmath/source/utility \
+	starmath/source/view \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
+
+$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
+	-I$(SRCDIR)/starmath/inc \
+	-I$(SRCDIR)/starmath/sdi \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
new file mode 100644
index 000000000000..ae2dde0e69f1
--- /dev/null
+++ b/starmath/Library_smd.mk
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,smd))
+
+$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+
+$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
+
+$(eval $(call gb_Library_set_include,smd,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/starmath/inc \
+	-I$(SRCDIR)/starmath/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,smd,\
+	$$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,smd,\
+	cppu \
+	cppuhelper \
+	sal \
+	sfx \
+	sm \
+	sot \
+	svl \
+	svt \
+	tl \
+	ucbhelper \
+	vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,smd,\
+	starmath/source/detreg \
+	starmath/source/smdetect \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/qa/unoapi/makefile.mk b/starmath/Makefile
index 68fcfe744868..a79aff831024 100644
--- a/starmath/qa/unoapi/makefile.mk
+++ b/starmath/Makefile
@@ -1,6 +1,7 @@
 #*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -21,28 +22,17 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = starmath
-TARGET = qa_unoapi
+#
+#*************************************************************************
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/starmath/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-ALLTAR : javatest
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.END
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
new file mode 100644
index 000000000000..da3addf98c52
--- /dev/null
+++ b/starmath/Module_starmath.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,starmath))
+
+$(eval $(call gb_Module_add_targets,starmath,\
+	AllLangResTarget_sm \
+	Library_sm \
+	Library_smd \
+	Package_uiconfig \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
+	JunitTest_sm_unoapi \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk
new file mode 100644
index 000000000000..d01d857ec1e8
--- /dev/null
+++ b/starmath/Package_uiconfig.mk
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sm_uiconfig,$(SRCDIR)/starmath/uiconfig))
+$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml))
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index bfecbc4a7f6d..496008bddd18 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -1,9 +1,2 @@
 sm	starmath	: LIBXSLT:libxslt L10N:l10n svx NULL
-sm	starmath								usr1	-	all	sm_mkout NULL
-sm	starmath\inc							nmake	-	all	sm_inc NULL
-sm	starmath\prj							get		-	all	sm_prj NULL
-sm	starmath\res							get		-	all	sm_res NULL
-sm	starmath\sdi							nmake	-	all	sm_sdi NULL
-sm	starmath\source							nmake	-	all	sm_sorce sm_sdi sm_inc NULL
-sm	starmath\util							nmake	-	all	sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm	starmath\prj							nmake		-	all	sm_prj NULL
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index 78bae57498ea..e69de29bb2d1 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
-..\%__SRC%\bin\smd?????.dll %_DEST%\bin%_EXT%\smd?????.dll
-..\%__SRC%\bin\sm*.res %_DEST%\bin%_EXT%\sm*.res
-..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc%_EXT%\starmath
-
-..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
-..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
-..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
-..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
-..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
diff --git a/starmath/inc/makefile.mk b/starmath/prj/makefile.mk
index 930e5281c6fb..88cd9dfe08b8 100644
--- a/starmath/inc/makefile.mk
+++ b/starmath/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=starmath
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
deleted file mode 100644
index ef4b261ce0b3..000000000000
--- a/starmath/source/detreg.cxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_starmath.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <rtl/ustring.hxx>
-
-#include "smdetect.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-
-extern "C" {
-
-void SAL_CALL component_getImplementationEnvironment(
-        const  sal_Char**   ppEnvironmentTypeName,
-        uno_Environment**  /*ppEnvironment*/           )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
-                                     void* pServiceManager,
-                                     void* /*pRegistryKey*/ )
-{
-    // Set default return value for this operation - if it failed.
-    void* pReturn = NULL ;
-
-    if  (
-            ( pImplementationName   !=  NULL ) &&
-            ( pServiceManager       !=  NULL )
-        )
-    {
-        // Define variables which are used in following macros.
-        Reference< XSingleServiceFactory >   xFactory                                                                                                ;
-        Reference< XMultiServiceFactory >    xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
-        if( SmFilterDetect::impl_getStaticImplementationName().equalsAscii( pImplementationName ) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmFilterDetect::impl_getStaticImplementationName(),
-            SmFilterDetect::impl_createInstance,
-            SmFilterDetect::impl_getStaticSupportedServiceNames() );
-        }
-
-        // Factory is valid - service was found.
-        if ( xFactory.is() )
-        {
-            xFactory->acquire();
-            pReturn = xFactory.get();
-        }
-    }
-
-    // Return with result of this operation.
-    return pReturn ;
-}
-} // extern "C"
-
-
-
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index 330f5767384c..bfb6f5e159d7 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -57,7 +57,7 @@ public:
     void Write(SvStorageStream *pS);
 };
 
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
 
 #endif
 
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
deleted file mode 100755
index c9f0226c8df4..000000000000
--- a/starmath/source/makefile.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#MKDEPENDSOLVER=YES
-
-PRJ=..
-
-PRJNAME=starmath
-TARGET=starmath
-
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SMDLL=TRUE
-
-SRS2NAME =smres
-SRC2FILES = smres.src   \
-            symbol.src	\
-            toolbox.src \
-            commands.src
-
-SLO1FILES =  \
-        $(SLO)$/accessibility.obj \
-        $(SLO)$/action.obj \
-        $(SLO)$/cfgitem.obj \
-        $(SLO)$/config.obj \
-        $(SLO)$/dialog.obj \
-        $(SLO)$/document.obj \
-        $(SLO)$/edit.obj \
-        $(SLO)$/eqnolefilehdr.obj \
-        $(SLO)$/format.obj \
-        $(SLO)$/mathmlexport.obj \
-        $(SLO)$/mathmlimport.obj \
-        $(SLO)$/mathtype.obj \
-        $(SLO)$/node.obj \
-        $(SLO)$/parse.obj \
-        $(SLO)$/rect.obj \
-        $(SLO)$/register.obj \
-        $(SLO)$/smdll.obj \
-        $(SLO)$/smmod.obj \
-        $(SLO)$/symbol.obj \
-        $(SLO)$/toolbox.obj \
-        $(SLO)$/typemap.obj \
-        $(SLO)$/types.obj \
-        $(SLO)$/unodoc.obj \
-        $(SLO)$/utility.obj \
-        $(SLO)$/view.obj \
-        $(SLO)$/unomodel.obj
-
-SLO2FILES =  \
-        $(SLO)$/register.obj  \
-        $(SLO)$/detreg.obj
-
-SLOFILES = \
-    $(SLO)$/smdetect.obj \
-    $(SLO1FILES) \
-    $(SLO2FILES)
-
-LIB1TARGET = \
-    $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
-    $(SLO1FILES)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(INCCOM)$/dllname.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    echo \#define DLL_NAME \"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    echo $(EMQ)#define DLL_NAME $(EMQ)"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
-
-$(SRS)$/$(SRS2NAME).srs  : $(LOCALIZE_ME_DEST)
-
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
deleted file mode 100644
index a7e7ea2110a6..000000000000
--- a/starmath/source/register.cxx
+++ /dev/null
@@ -1,233 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_starmath.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <rtl/ustring.hxx>
-
-#include <sfx2/sfxmodelfactory.hxx>
-
-#include "smdll.hxx"
-#include "document.hxx"
-#include "unomodel.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-
-//Math document
-extern Sequence< OUString > SAL_CALL
-        SmDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmDocument_getImplementationName() throw();
-extern Reference< XInterface >SAL_CALL
-        SmDocument_createInstance(const Reference< XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags) throw( Exception );
-
-//MathML import
-extern Sequence< OUString > SAL_CALL
-        SmXMLImport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLImport_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLImportMeta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLImportMeta_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLImportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLImportSettings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLImportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-
-//MathML export
-extern Sequence< OUString > SAL_CALL
-        SmXMLExport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExport_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLExportMetaOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExportMetaOOO_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExportMetaOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLExportMeta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExportMeta_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLExportSettingsOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExportSettingsOOO_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExportSettingsOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLExportSettings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExportSettings_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-        SmXMLExportContent_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-        SmXMLExportContent_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-        SmXMLExportContent_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
-
-
-extern "C" {
-
-void SAL_CALL component_getImplementationEnvironment(
-        const  sal_Char**   ppEnvironmentTypeName,
-        uno_Environment**   /*ppEnvironment*/  )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
-                                     void* pServiceManager,
-                                     void* /*pRegistryKey*/ )
-{
-    // Set default return value for this operation - if it failed.
-    void* pReturn = NULL ;
-
-    if  (
-            ( pImplementationName   !=  NULL ) &&
-            ( pServiceManager       !=  NULL )
-        )
-    {
-        // Define variables which are used in following macros.
-        Reference< XSingleServiceFactory >   xFactory                                                                                                ;
-        Reference< XMultiServiceFactory >    xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
-        if( SmXMLImport_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLImport_getImplementationName(),
-            SmXMLImport_createInstance,
-            SmXMLImport_getSupportedServiceNames() );
-        }
-        else if( SmXMLExport_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExport_getImplementationName(),
-            SmXMLExport_createInstance,
-            SmXMLExport_getSupportedServiceNames() );
-        }
-        else if( SmXMLImportMeta_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLImportMeta_getImplementationName(),
-            SmXMLImportMeta_createInstance,
-            SmXMLImportMeta_getSupportedServiceNames() );
-        }
-        else if( SmXMLExportMetaOOO_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExportMetaOOO_getImplementationName(),
-            SmXMLExportMetaOOO_createInstance,
-            SmXMLExportMetaOOO_getSupportedServiceNames() );
-        }
-        else if( SmXMLExportMeta_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExportMeta_getImplementationName(),
-            SmXMLExportMeta_createInstance,
-            SmXMLExportMeta_getSupportedServiceNames() );
-        }
-        else if( SmXMLImportSettings_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLImportSettings_getImplementationName(),
-            SmXMLImportSettings_createInstance,
-            SmXMLImportSettings_getSupportedServiceNames() );
-        }
-        else if( SmXMLExportSettingsOOO_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExportSettingsOOO_getImplementationName(),
-            SmXMLExportSettingsOOO_createInstance,
-            SmXMLExportSettingsOOO_getSupportedServiceNames() );
-        }
-        else if( SmXMLExportSettings_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExportSettings_getImplementationName(),
-            SmXMLExportSettings_createInstance,
-            SmXMLExportSettings_getSupportedServiceNames() );
-        }
-        else if( SmXMLExportContent_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::cppu::createSingleFactory( xServiceManager,
-            SmXMLExportContent_getImplementationName(),
-            SmXMLExportContent_createInstance,
-            SmXMLExportContent_getSupportedServiceNames() );
-        }
-        else if( SmDocument_getImplementationName().equalsAsciiL(
-            pImplementationName, strlen(pImplementationName)) )
-        {
-            xFactory = ::sfx2::createSfxModelFactory( xServiceManager,
-            SmDocument_getImplementationName(),
-            SmDocument_createInstance,
-            SmDocument_getSupportedServiceNames() );
-        }
-
-
-        // Factory is valid - service was found.
-        if ( xFactory.is() )
-        {
-            xFactory->acquire();
-            pReturn = xFactory.get();
-        }
-    }
-
-    // Return with result of this operation.
-    return pReturn ;
-}
-} // extern "C"
-
-
-
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index aba7432cc6ed..7da3838557b3 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -29,17 +29,13 @@
 #include "precompiled_starmath.hxx"
 
 #include "smdetect.hxx"
-
-//#include <framework/interaction.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -49,12 +45,8 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <framework/interaction.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <ucbhelper/simpleinteractionrequest.hxx>
-
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
 #include <svl/itemset.hxx>
@@ -76,8 +68,8 @@
 #include <sfx2/brokenpackageint.hxx>
 
 #include "document.hxx"
-#include "eqnolefilehdr.hxx"
 
+extern sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src
deleted file mode 100644
index 23a4aab1eb76..000000000000
--- a/starmath/util/hidother.src
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "../inc/helpids.h"
-
-hidspecial HID_SMA_OPTIONSDIALOG           { HelpId = HID_SMA_OPTIONSDIALOG; };
-hidspecial HID_SMA_FONTDIALOG              { HelpId = HID_SMA_FONTDIALOG; };
-hidspecial HID_SMA_FONTSIZEDIALOG          { HelpId = HID_SMA_FONTSIZEDIALOG; };
-hidspecial HID_SMA_FONTTYPEDIALOG          { HelpId = HID_SMA_FONTTYPEDIALOG; };
-hidspecial HID_SMA_DISTANCEDIALOG          { HelpId = HID_SMA_DISTANCEDIALOG; };
-hidspecial HID_SMA_ALIGNDIALOG             { HelpId = HID_SMA_ALIGNDIALOG; };
-hidspecial HID_SMA_PRINTOPTIONPAGE         { HelpId = HID_SMA_PRINTOPTIONPAGE; };
-hidspecial HID_SMA_SYMBOLDIALOG            { HelpId = HID_SMA_SYMBOLDIALOG; };
-hidspecial HID_SMA_SYMDEFINEDIALOG         { HelpId = HID_SMA_SYMDEFINEDIALOG; };
-hidspecial HID_SMA_EXTRAOPTIONPAGE         { HelpId = HID_SMA_EXTRAOPTIONPAGE; };
-hidspecial HID_SMA_DOCSAVEQUERY            { HelpId = HID_SMA_DOCSAVEQUERY; };
-hidspecial HID_SMA_OBJECTSAVEQUERY         { HelpId = HID_SMA_OBJECTSAVEQUERY; };
-hidspecial HID_SMA_DEFAULTSAVEQUERY        { HelpId = HID_SMA_DEFAULTSAVEQUERY; };
-hidspecial HID_SMA_ILLEGALOBJECTERROR      { HelpId = HID_SMA_ILLEGALOBJECTERROR; };
-hidspecial HID_SMA_ILLEGALFILEERROR        { HelpId = HID_SMA_ILLEGALFILEERROR; };
-hidspecial HID_SMA_WRITESYMBOLERROR        { HelpId = HID_SMA_WRITESYMBOLERROR; };
-hidspecial HID_SMA_READSYMBOLERROR         { HelpId = HID_SMA_READSYMBOLERROR; };
-hidspecial HID_SMA_NOMATHTYPEFACEWARNING   { HelpId = HID_SMA_NOMATHTYPEFACEWARNING; };
-hidspecial HID_SMA_OBJECTNAME              { HelpId = HID_SMA_OBJECTNAME; };
-hidspecial HID_SMA_VIEWNAME                { HelpId = HID_SMA_VIEWNAME; };
-hidspecial HID_SMA_UNDOEDITNAME            { HelpId = HID_SMA_UNDOEDITNAME; };
-hidspecial HID_SMA_UNDOFORMATNAME          { HelpId = HID_SMA_UNDOFORMATNAME; };
-hidspecial HID_SMA_APPICO                  { HelpId = HID_SMA_APPICO; };
-hidspecial HID_SMA_DOCICO                  { HelpId = HID_SMA_DOCICO; };
-hidspecial HID_SMA_TMPICO                  { HelpId = HID_SMA_TMPICO; };
-hidspecial HID_SMA_COMMANDMENU             { HelpId = HID_SMA_COMMANDMENU; };
-hidspecial HID_SMA_VIEWMENU                { HelpId = HID_SMA_VIEWMENU; };
-hidspecial HID_SMA_DISTANCEMENU            { HelpId = HID_SMA_DISTANCEMENU; };
-hidspecial HID_SMA_FONTMENU                { HelpId = HID_SMA_FONTMENU; };
-hidspecial HID_SMA_STARTUPWINDOW           { HelpId = HID_SMA_STARTUPWINDOW; };
-hidspecial HID_SMA_TOOLBOXWINDOW           { HelpId = HID_SMA_TOOLBOXWINDOW; };
-hidspecial HID_SMA_CMDBOXWINDOW            { HelpId = HID_SMA_CMDBOXWINDOW; };
-hidspecial HID_SMA_UPDATEOBJECT            { HelpId = HID_SMA_UPDATEOBJECT; };
-hidspecial HID_SMA_FONTREGULAR             { HelpId = HID_SMA_FONTREGULAR; };
-hidspecial HID_SMA_FONTITALIC              { HelpId = HID_SMA_FONTITALIC; };
-hidspecial HID_SMA_FONTBOLD                { HelpId = HID_SMA_FONTBOLD; };
-hidspecial HID_SMA_PRINTOPTION             { HelpId = HID_SMA_PRINTOPTION; };
-hidspecial HID_SMA_DOCUMENTSTR             { HelpId = HID_SMA_DOCUMENTSTR; };
-hidspecial HID_SMA_SYMBOLFILESSTR          { HelpId = HID_SMA_SYMBOLFILESSTR; };
-hidspecial HID_SMA_ALLFILESSTR             { HelpId = HID_SMA_ALLFILESSTR; };
-hidspecial HID_SMA_CREATORSTR              { HelpId = HID_SMA_CREATORSTR; };
-hidspecial HID_SMA_FILESMFTYP              { HelpId = HID_SMA_FILESMFTYP; };
-hidspecial HID_SMA_FILESYMTYP              { HelpId = HID_SMA_FILESYMTYP; };
-hidspecial HID_SMA_WIN_DOCUMENT            { HelpId = HID_SMA_WIN_DOCUMENT; };
-hidspecial HID_SMA_COMMAND_WIN_EDIT        { HelpId = HID_SMA_COMMAND_WIN_EDIT; };
-
-hidspecial HID_SMA_DEFAULT_DIST         { HelpId = HID_SMA_DEFAULT_DIST; };
-hidspecial HID_SMA_LINE_DIST            { HelpId = HID_SMA_LINE_DIST; };
-hidspecial HID_SMA_ROOT_DIST            { HelpId = HID_SMA_ROOT_DIST; };
-hidspecial HID_SMA_SUP_DIST             { HelpId = HID_SMA_SUP_DIST; };
-hidspecial HID_SMA_SUB_DIST             { HelpId = HID_SMA_SUB_DIST; };
-hidspecial HID_SMA_NUMERATOR_DIST       { HelpId = HID_SMA_NUMERATOR_DIST; };
-hidspecial HID_SMA_DENOMINATOR_DIST     { HelpId = HID_SMA_DENOMINATOR_DIST; };
-hidspecial HID_SMA_FRACLINE_EXCWIDTH    { HelpId = HID_SMA_FRACLINE_EXCWIDTH; };
-hidspecial HID_SMA_FRACLINE_LINEWIDTH   { HelpId = HID_SMA_FRACLINE_LINEWIDTH; };
-hidspecial HID_SMA_UPPERLIMIT_DIST      { HelpId = HID_SMA_UPPERLIMIT_DIST; };
-hidspecial HID_SMA_LOWERLIMIT_DIST      { HelpId = HID_SMA_LOWERLIMIT_DIST; };
-hidspecial HID_SMA_BRACKET_EXCHEIGHT    { HelpId = HID_SMA_BRACKET_EXCHEIGHT; };
-hidspecial HID_SMA_BRACKET_DIST         { HelpId = HID_SMA_BRACKET_DIST; };
-hidspecial HID_SMA_BRACKET_EXCHEIGHT2   { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; };
-hidspecial HID_SMA_MATRIXROW_DIST       { HelpId = HID_SMA_MATRIXROW_DIST; };
-hidspecial HID_SMA_MATRIXCOL_DIST       { HelpId = HID_SMA_MATRIXCOL_DIST; };
-hidspecial HID_SMA_ATTRIBUT_DIST        { HelpId = HID_SMA_ATTRIBUT_DIST; };
-hidspecial HID_SMA_INTERATTRIBUT_DIST   { HelpId = HID_SMA_INTERATTRIBUT_DIST; };
-hidspecial HID_SMA_OPERATOR_EXCHEIGHT   { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; };
-hidspecial HID_SMA_OPERATOR_DIST        { HelpId = HID_SMA_OPERATOR_DIST; };
-hidspecial HID_SMA_LEFTBORDER_DIST      { HelpId = HID_SMA_LEFTBORDER_DIST; };
-hidspecial HID_SMA_RIGHTBORDER_DIST     { HelpId = HID_SMA_RIGHTBORDER_DIST; };
-hidspecial HID_SMA_UPPERBORDER_DIST     { HelpId = HID_SMA_UPPERBORDER_DIST; };
-hidspecial HID_SMA_LOWERBORDER_DIST     { HelpId = HID_SMA_LOWERBORDER_DIST; };
-
-//! this shouldn't have been necessary!
-hidspecial HID_SMA_ALEPH                   { HelpId = HID_SMA_ALEPH; };
-hidspecial HID_SMA_EMPTYSET                { HelpId = HID_SMA_EMPTYSET; };
-hidspecial HID_SMA_RE                      { HelpId = HID_SMA_RE; };
-hidspecial HID_SMA_IM                      { HelpId = HID_SMA_IM; };
-hidspecial HID_SMA_INFINITY                { HelpId = HID_SMA_INFINITY; };
-hidspecial HID_SMA_PARTIAL                 { HelpId = HID_SMA_PARTIAL; };
-hidspecial HID_SMA_WP                      { HelpId = HID_SMA_WP; };
-hidspecial HID_SMA_DOTSAXIS                { HelpId = HID_SMA_DOTSAXIS; };
-hidspecial HID_SMA_DOTSUP                  { HelpId = HID_SMA_DOTSUP; };
-hidspecial HID_SMA_DOTSDOWN                { HelpId = HID_SMA_DOTSDOWN; };
-hidspecial HID_SMA_DOTSLOW                 { HelpId = HID_SMA_DOTSLOW; };
-hidspecial HID_SMA_DOTSVERT                { HelpId = HID_SMA_DOTSVERT; };
-hidspecial HID_SMA_NABLA                   { HelpId = HID_SMA_NABLA; };
-hidspecial HID_SMA_EXISTS                  { HelpId = HID_SMA_EXISTS; };
-hidspecial HID_SMA_FORALL                  { HelpId = HID_SMA_FORALL; };
-
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
deleted file mode 100644
index 09fedb57fb2c..000000000000
--- a/starmath/util/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=starmath
-TARGET=smath3
-LIBTARGET=NO
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-RESLIB1NAME=sm
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
-    $(SRS)$/smres.srs 
-
-SHL1TARGET= sm$(DLLPOSTFIX)
-SHL1IMPLIB= smimp
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=		$(SHL1TARGET)
-
-SHL1STDLIBS= \
-            $(EDITENGLIB) \
-            $(SVXCORELIB) \
-            $(SVXLIB) \
-            $(SFX2LIB) \
-            $(XMLOFFLIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SVLLIB)	\
-            $(I18NPAPERLIB)     \
-            $(SOTLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(COMPHELPERLIB) \
-            $(CPPUHELPERLIB) \
-            $(CPPULIB) \
-            $(SALLIB)
-
-SHL2TARGET= smd$(DLLPOSTFIX)
-SHL2IMPLIB= smdimp
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=		$(SHL2TARGET)
-
-SHL2STDLIBS= \
-            $(SFX2LIB) \
-            $(SVTOOLLIB) \
-            $(SVLLIB) \
-            $(VCLLIB) \
-            $(SOTLIB) \
-            $(TOOLSLIB) \
-            $(UCBHELPERLIB) \
-            $(CPPUHELPERLIB) \
-            $(CPPULIB) \
-            $(SALLIB)
-
-SHL2DEPN=	makefile.mk
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2OBJS=   $(SLO)$/smdetect.obj \
-            $(SLO)$/detreg.obj \
-            $(SLO)$/eqnolefilehdr.obj
-
-SHL1DEPN=	makefile.mk
-SHL1LIBS=   $(SLB)$/starmath.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)$(COM)" != "WNTGCC"
-SHL1OBJS=   $(SLO)$/smdll.obj
-.ENDIF
-.ENDIF # ! UNX
-
-.IF "$(GUI)" == "WNT"
-SHL1RES=	$(RCTARGET)
-.ENDIF # WNT
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/sm.component $(MISC)/smd.component
-
-$(MISC)/sm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sm.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sm.component
-
-$(MISC)/smd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        smd.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt smd.component