embedserv: convert to gbuild

19 files changed, 207 insertions, 646 deletions

diff --git a/Makefile b/Makefile
index df5b638a1d26..f43fa3cf995a 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ drawinglayer\
 dtrans\
 editeng\
 embeddedobj\
+embedserv\
 eventattacher\
 extensions\
 fileaccess\
@@ -155,7 +156,6 @@ crashrep\
 ct2n\
 curl\
 dictionaries \
-embedserv\
 epm\
 expat\
 external\
diff --git a/Repository.mk b/Repository.mk
index 72c2f5ca7c97..561d645f6710 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -402,9 +402,11 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     dnd \
     dtrans \
+    emser \
     fop \
     fps \
     ftransl \
+    inprocserv \
     so_activex \
     so_activex_x64 \
     sysdtrans \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c2d8f2a5c72d..ba71994f367a 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     dtrans \
     editeng \
     embeddedobj \
+    embedserv \
     eventattacher \
     extensions \
     fileaccess \
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
new file mode 100644
index 000000000000..a6f564df73a9
--- /dev/null
+++ b/embedserv/Library_emser.mk
@@ -0,0 +1,83 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,emser))
+
+$(eval $(call gb_Library_set_componentfile,emser,embedserv/util/emser))
+
+$(eval $(call gb_Library_set_include,emser,\
+	-I$(SRCDIR)/embedserv/source/inc \
+	-I$(ATL_INCLUDE) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,emser,\
+	-UNOMINMAX \
+))
+
+$(eval $(call gb_Library_add_api,emser,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,emser,\
+	cppu \
+	cppuhelper \
+	gdi32 \
+	ole32 \
+	oleaut32 \
+	sal \
+	uuid \
+	$(gb_STDLIBS) \
+))
+
+ifeq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,emser,\
+	$(ATL_LIB)/atls.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,emser,\
+	$(ATL_LIB)/atlsd.lib \
+))
+
+$(eval $(call gb_Library_add_exception_objects,emser,\
+	embedserv/source/embed/docholder \
+	embedserv/source/embed/ed_idataobj \
+	embedserv/source/embed/ed_iinplace \
+	embedserv/source/embed/ed_ioleobject \
+	embedserv/source/embed/ed_ipersiststr \
+	embedserv/source/embed/esdll \
+	embedserv/source/embed/guid \
+	embedserv/source/embed/iipaobj \
+	embedserv/source/embed/intercept \
+	embedserv/source/embed/register \
+	embedserv/source/embed/servprov \
+	embedserv/source/embed/syswinwrapper \
+	embedserv/source/embed/tracker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
new file mode 100644
index 000000000000..27d93de61d13
--- /dev/null
+++ b/embedserv/Library_inprocserv.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,inprocserv))
+
+$(eval $(call gb_Library_set_include,inprocserv,\
+	-I$(SRCDIR)/embedserv/source/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,inprocserv,\
+	gdi32 \
+	ole32 \
+	uuid \
+	$(gb_STDLIBS) \
+))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_ldflags,inprocserv,\
+	/EXPORT:DllCanUnloadNow \
+	/EXPORT:DllGetClassObject \
+	/EXPORT:DllMain \
+	/EXPORT:DllRegisterServer \
+	/EXPORT:DllUnregisterServer \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,inprocserv,\
+	embedserv/source/inprocserv/advisesink \
+	embedserv/source/inprocserv/dllentry \
+	embedserv/source/inprocserv/inprocembobj \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/embedserv/Makefile b/embedserv/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/embedserv/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/embedserv/Module_embedserv.mk b/embedserv/Module_embedserv.mk
new file mode 100644
index 000000000000..718e2b6a1471
--- /dev/null
+++ b/embedserv/Module_embedserv.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,embedserv))
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Module_add_targets,embedserv,\
+	Library_inprocserv \
+))
+
+ifeq ($(DISABLE_ATL),)
+$(eval $(call gb_Module_add_targets,embedserv,\
+	Library_emser \
+))
+endif
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/embedserv/prj/build.lst b/embedserv/prj/build.lst
index a6cfd10ea298..6af5685693ec 100644
--- a/embedserv/prj/build.lst
+++ b/embedserv/prj/build.lst
@@ -1,5 +1,2 @@
 es	embedserv	:	offapi sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL
-es	embedserv								usr1	-	w	es_mkout NULL
-es	embedserv\source\embed					nmake	-	w	es_embed NULL
-es	embedserv\source\inprocserv				nmake	-	w	es_inproc NULL
-es	embedserv\util							nmake	-	w	es_util es_embed.w es_inproc.w NULL
+es	embedserv\prj	nmake	-	all	es_prj NULL
diff --git a/embedserv/prj/d.lst b/embedserv/prj/d.lst
index 292dfe821cd3..e69de29bb2d1 100644
--- a/embedserv/prj/d.lst
+++ b/embedserv/prj/d.lst
@@ -1,2 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\misc\emser.component %_DEST%\xml\emser.component
diff --git a/embedserv/prj/makefile.mk b/embedserv/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/embedserv/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/embedserv/source/embed/makefile.mk b/embedserv/source/embed/makefile.mk
deleted file mode 100644
index 0c2415987daa..000000000000
--- a/embedserv/source/embed/makefile.mk
+++ /dev/null
@@ -1,80 +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=embedserv
-TARGET=emser
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(DISABLE_ATL)"==""
-
-LIBTARGET=NO
-USE_DEFFILE=NO
-
-INCPRE+= $(ATL_INCLUDE) 
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/register.obj       \
-        $(SLO)$/servprov.obj       \
-        $(SLO)$/docholder.obj      \
-        $(SLO)$/ed_ipersiststr.obj \
-        $(SLO)$/ed_idataobj.obj    \
-        $(SLO)$/ed_ioleobject.obj  \
-        $(SLO)$/ed_iinplace.obj    \
-        $(SLO)$/iipaobj.obj        \
-        $(SLO)$/guid.obj           \
-        $(SLO)$/esdll.obj          \
-        $(SLO)$/intercept.obj      \
-        $(SLO)$/syswinwrapper.obj  \
-        $(SLO)$/tracker.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/register.obj       \
-        $(SLO)$/servprov.obj       \
-        $(SLO)$/docholder.obj      \
-        $(SLO)$/ed_ipersiststr.obj \
-        $(SLO)$/ed_idataobj.obj    \
-        $(SLO)$/ed_iinplace.obj    \
-        $(SLO)$/ed_ioleobject.obj  \
-        $(SLO)$/iipaobj.obj        \
-        $(SLO)$/intercept.obj      \
-        $(SLO)$/syswinwrapper.obj  \
-        $(SLO)$/tracker.obj
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/embedserv/source/embed/stdafx.cpp b/embedserv/source/embed/stdafx.cpp
deleted file mode 100644
index efb58b5d7773..000000000000
--- a/embedserv/source/embed/stdafx.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// stdafx1.cpp : source file that includes just the standard includes
-//  stdafx1.pch will be the pre-compiled header
-//  stdafx1.obj will contain the pre-compiled type information
-
-
-#include "stdafx2.h"
-
-#ifdef _ATL_STATIC_REGISTRY
-#include <statreg.h>
-#include <statreg.cpp>
-#endif
-
-#include <atlimpl.cpp>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/xwin.cxx b/embedserv/source/embed/xwin.cxx
deleted file mode 100644
index 473647419cb9..000000000000
--- a/embedserv/source/embed/xwin.cxx
+++ /dev/null
@@ -1,349 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 "xwin.hxx"
-#include <com/sun/star/lang/SystemDependent.hpp>
-
-
-using namespace ::com::sun::star;
-
-
-ContainerWindowWrapper::ContainerWindowWrapper(HWND aHwnd)
-    : m_aHwnd(aHwnd),
-      m_pDisposeEventListeners(0)
-{
-}
-
-ContainerWindowWrapper::~ContainerWindowWrapper()
-{
-    delete m_pDisposeEventListeners;
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::dispose(
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-    cppu::OInterfaceContainerHelper *pDisposeEventListeners(0);
-
-    {
-        osl::MutexGuard aGuard(m_aMutex);
-        pDisposeEventListeners = m_pDisposeEventListeners;
-    }
-
-    if(pDisposeEventListeners) {
-        lang::EventObject aEvt;
-        aEvt.Source = static_cast< awt::XWindow* >(this);
-
-        pDisposeEventListeners->disposeAndClear(aEvt);
-    }
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::addEventListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::lang::XEventListener >& Listener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-    cppu::OInterfaceContainerHelper *pDisposeEventListeners(0);
-    {
-        osl::MutexGuard aGuard(m_aMutex);
-        pDisposeEventListeners = m_pDisposeEventListeners;
-    }
-
-    if(! pDisposeEventListeners)
-    {
-        osl::MutexGuard aGuard(m_aMutex);
-        pDisposeEventListeners = m_pDisposeEventListeners =
-            new cppu::OInterfaceContainerHelper(m_aMutex);
-    }
-
-    pDisposeEventListeners->addInterface( Listener );
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::removeEventListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::lang::XEventListener >& Listener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-    cppu::OInterfaceContainerHelper *pDisposeEventListeners(0);
-    {
-        osl::MutexGuard aGuard(m_aMutex);
-        pDisposeEventListeners = m_pDisposeEventListeners;
-    }
-    if( pDisposeEventListeners )
-        pDisposeEventListeners->removeInterface( Listener );
-}
-
-
-
-// XSystemDependentWindowPeer
-
-::com::sun::star::uno::Any SAL_CALL
-ContainerWindowWrapper::getWindowHandle(
-    const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId,
-    sal_Int16 SystemType
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-    if(SystemType == lang::SystemDependent::SYSTEM_WIN32 ||
-       SystemType == lang::SystemDependent::SYSTEM_WIN16)
-    {
-        uno::Any aAny;
-        sal_Int32 nHwnd = sal_Int32(m_aHwnd);
-        aAny <<= nHwnd;
-        return aAny;
-    }
-    else
-        return uno::Any();
-}
-
-
-
-void SAL_CALL
-ContainerWindowWrapper::setPosSize(
-    sal_Int32 X,
-    sal_Int32 Y,
-    sal_Int32 Width,
-    sal_Int32 Height,
-    sal_Int16 Flags
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException)
-{
-
-}
-
-::com::sun::star::awt::Rectangle SAL_CALL
-ContainerWindowWrapper::getPosSize(
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-    return awt::Rectangle();
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::setVisible(
-    sal_Bool Visible
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::setEnable(
-    sal_Bool Enable
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::setFocus(
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::addWindowListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XWindowListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::removeWindowListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XWindowListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::addFocusListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XFocusListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::removeFocusListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XFocusListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::addKeyListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XKeyListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::removeKeyListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XKeyListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::addMouseListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XMouseListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::removeMouseListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XMouseListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-
-void SAL_CALL
-ContainerWindowWrapper::addMouseMotionListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XMouseMotionListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::removeMouseMotionListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XMouseMotionListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::addPaintListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XPaintListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-void SAL_CALL
-ContainerWindowWrapper::removePaintListener(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XPaintListener >& xListener
-)
-    throw (
-        ::com::sun::star::uno::RuntimeException
-    )
-{
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index b54c2c6e42db..ba6374658715 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -30,6 +30,9 @@
 #include <inprocembobj.h>
 #ifdef __MINGW32__
 #define INITGUID
+#define INPROC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define INPROC_DLLPUBLIC
 #endif
 #include <embservconst.h>
 
@@ -167,7 +170,7 @@ protected:
 // ===========================
 
 // -------------------------------------------------------------------------------
-extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ )
+extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ )
 {
     if (dwReason == DLL_PROCESS_ATTACH)
     {
@@ -181,7 +184,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lp
 }
 
 // -------------------------------------------------------------------------------
-extern "C" STDAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
+extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 {
     for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ )
          if ( *guidList[nInd] == rclsid )
@@ -201,7 +204,7 @@ extern "C" STDAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 }
 
 // -------------------------------------------------------------------------------
-extern "C" STDAPI DllCanUnloadNow()
+extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow()
 {
     if ( !g_nObj && !g_nLock )
         return S_OK;
@@ -210,7 +213,7 @@ extern "C" STDAPI DllCanUnloadNow()
 }
 
 // -------------------------------------------------------------------------------
-STDAPI DllRegisterServer( void )
+STDAPI INPROC_DLLPUBLIC DllRegisterServer( void )
 {
     char aLibPath[1024];
     HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" );
@@ -228,7 +231,7 @@ STDAPI DllRegisterServer( void )
 }
 
 // -------------------------------------------------------------------------------
-STDAPI DllUnregisterServer( void )
+STDAPI INPROC_DLLPUBLIC DllUnregisterServer( void )
 {
     return WriteLibraryToRegistry( "ole32.dll", 10 );
 }
diff --git a/embedserv/source/inprocserv/exports.dxp b/embedserv/source/inprocserv/exports.dxp
deleted file mode 100644
index 65a5126f162e..000000000000
--- a/embedserv/source/inprocserv/exports.dxp
+++ /dev/null
@@ -1,5 +0,0 @@
-DllGetClassObject
-DllCanUnloadNow
-DllMain
-DllRegisterServer
-DllUnregisterServer
diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk
deleted file mode 100644
index 024e0f9d4ee3..000000000000
--- a/embedserv/source/inprocserv/makefile.mk
+++ /dev/null
@@ -1,80 +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=embedserv
-TARGET=inprocserv
-
-use_shl_versions=
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(GUI)" == "WNT"
-
-LIBTARGET=NO
-USE_DEFFILE=YES
-LIBCMT=libcmt.lib
-UWINAPILIB=
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-    $(SLO)$/dllentry.obj \
-    $(SLO)$/advisesink.obj \
-    $(SLO)$/inprocembobj.obj
-
-SHL1TARGET=$(TARGET)
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS += -lstdc++
-.IF "$(MINGW_GCCLIB_EH)"=="YES"
-SHL1STDLIBS += -lgcc_eh
-.ENDIF
-SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
-.ELSE
-SHL1STDLIBS=
-.ENDIF
-
-SHL1STDLIBS+=\
-    $(UUIDLIB)\
-    $(OLE32LIB)\
-    $(GDI32LIB)\
-    $(ADVAPI32LIB)
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(TARGET).def
-
-DEF1NAME= $(TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/embedserv/util/exports.dxp b/embedserv/util/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/embedserv/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
deleted file mode 100644
index ce4b08b10f9f..000000000000
--- a/embedserv/util/makefile.mk
+++ /dev/null
@@ -1,102 +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=embedserv
-TARGET=emser
-LIBTARGET=NO
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-SHL1TARGET= emser$(DLLPOSTFIX)
-
-SHL1IMPLIB= emserimp
-SHL1OBJS= \
-        $(SLO)$/register.obj \
-        $(SLO)$/servprov.obj \
-        $(SLO)$/docholder.obj \
-        $(SLO)$/ed_ipersiststr.obj \
-        $(SLO)$/ed_idataobj.obj \
-        $(SLO)$/ed_ioleobject.obj \
-        $(SLO)$/ed_iinplace.obj \
-        $(SLO)$/iipaobj.obj \
-        $(SLO)$/guid.obj \
-        $(SLO)$/esdll.obj \
-        $(SLO)$/intercept.obj \
-        $(SLO)$/syswinwrapper.obj \
-        $(SLO)$/tracker.obj
-
-SHL1STDLIBS=\
-        $(SALLIB)			\
-        $(CPPULIB)			\
-        $(CPPUHELPERLIB)	\
-        $(OLE32LIB)			\
-        $(GDI32LIB)			\
-        $(UUIDLIB)				\
-        $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-SHL1STDLIBS+=\
-        $(ADVAPI32LIB)
-.IF "$(USE_DEBUG_RUNTIME)" == ""
-SHL1STDLIBS+=\
-        $(ATL_LIB)$/atls.lib
-.ELSE
-SHL1STDLIBS+=\
-        $(ATL_LIB)$/atlsd.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
-ALLTAR : $(MISC)/emser.component
-
-$(MISC)/emser.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        emser.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt emser.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f3a98a678b57..1954666e39cb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -356,7 +356,7 @@ my_components += \
 
 .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
 my_components += \
-    emser \
+    component/embedserv/util/emser \
     component/extensions/source/ole/oleautobridge
 .END