You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/06 19:23:06 UTC
svn commit: r1772938 - in /openoffice/trunk/main: Module_ooo.mk
Repository.mk postprocess/packcomponents/makefile.mk uui/prj/build.lst
uui/prj/d.lst uui/source/makefile.mk uui/source/services.cxx
uui/util/makefile.mk
Author: damjan
Date: Tue Dec 6 19:23:05 2016
New Revision: 1772938
URL: http://svn.apache.org/viewvc?rev=1772938&view=rev
Log:
Port main/uui to gbuild.
Patch by: me
Removed:
openoffice/trunk/main/uui/source/makefile.mk
openoffice/trunk/main/uui/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/uui/prj/build.lst
openoffice/trunk/main/uui/prj/d.lst
openoffice/trunk/main/uui/source/services.cxx
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Tue Dec 6 19:23:05 2016
@@ -67,6 +67,7 @@ $(eval $(call gb_Module_add_moduledirs,o
udkapi \
unotools \
unoxml \
+ uui \
vbahelper \
vcl \
wizards \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Tue Dec 6 19:23:05 2016
@@ -117,6 +117,7 @@ $(eval $(call gb_Helper_register_librari
vclplug_kde \
vclplug_kde4 \
vclplug_svp \
+ uui \
xcr \
xo \
xof \
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Dec 6 19:23:05 2016
@@ -115,6 +115,7 @@ my_components = \
component/sw/util/swd \
component/sw/util/vbaswobj \
component/unotools/util/utl \
+ component/uui/util/uui \
component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
@@ -186,7 +187,6 @@ my_components = \
ucptdoc1 \
updatefeed \
updchk \
- uui \
vbaevents \
vbaobj \
xmlfa \
Modified: openoffice/trunk/main/uui/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/prj/build.lst?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/uui/prj/build.lst (original)
+++ openoffice/trunk/main/uui/prj/build.lst Tue Dec 6 19:23:05 2016
@@ -1,4 +1,2 @@
uu uui : L10N:l10n vcl svtools LIBXSLT:libxslt NULL
-uu uui usr1 - all uu_mkout NULL
-uu uui\source nmake - all uu_source NULL
-uu uui\util nmake - all uu_util uu_source NULL
+uu uui\prj nmake - all uu_prj NULL
Modified: openoffice/trunk/main/uui/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/prj/d.lst?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/uui/prj/d.lst (original)
+++ openoffice/trunk/main/uui/prj/d.lst Tue Dec 6 19:23:05 2016
@@ -1,10 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\uui*.dll %_DEST%\bin%_EXT%\uui*.dll
-..\%__SRC%\bin\uui*.res %_DEST%\bin%_EXT%\uui*.res
-..\%__SRC%\lib\libuui*.* %_DEST%\lib%_EXT%\libuui*.*
-..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib
-
-..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml
-..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component
Modified: openoffice/trunk/main/uui/source/services.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/uui/source/services.cxx?rev=1772938&r1=1772937&r2=1772938&view=diff
==============================================================================
--- openoffice/trunk/main/uui/source/services.cxx (original)
+++ openoffice/trunk/main/uui/source/services.cxx Tue Dec 6 19:23:05 2016
@@ -43,7 +43,7 @@ using namespace com::sun::star::registry
//
//============================================================================
-extern "C" void SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
uno_Environment **)
{
@@ -56,7 +56,8 @@ component_getImplementationEnvironment(s
//
//============================================================================
-extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * pImplName,
void * pServiceManager,
void *)
{