rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch, NONE, 1.1 openoffice.org.spec, 1.1201, 1.1202
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Jun 8 11:10:21 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14418
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
Log Message:
add openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch ---
diff -ruN basic.pastbootstrap/source/app/app.cxx basic/source/app/app.cxx
--- basic.pastbootstrap/source/app/app.cxx 2007-06-08 10:09:03.000000000 +0200
+++ basic/source/app/app.cxx 2007-06-08 10:17:16.000000000 +0200
@@ -229,7 +229,7 @@
, SAL_MODULENAME( "ucpfile1" )
, "configmgr2.uno" SAL_DLLEXTENSION
, "sax.uno" SAL_DLLEXTENSION
- , "typeconverter.uno" SAL_DLLEXTENSION
+ , "stocservices.uno" SAL_DLLEXTENSION
, SAL_MODULENAME( "fileacc" )
, SAL_MODULENAME( "mcnttype" ) //Clipboard Ask Oliver Braun
, "i18npool.uno" SAL_DLLEXTENSION
diff -ruN connectivity.pastbootstrap/workben/testmoz/main.cxx connectivity/workben/testmoz/main.cxx
--- connectivity.pastbootstrap/workben/testmoz/main.cxx 2007-06-08 10:09:09.000000000 +0200
+++ connectivity/workben/testmoz/main.cxx 2007-06-08 10:17:16.000000000 +0200
@@ -220,7 +220,7 @@
, SAL_MODULENAME( "ucpfile1" )
, SAL_MODULENAME( "cfgmgr2" )
, "sax.uno" SAL_DLLEXTENSION
- , "typeconverter.uno" SAL_DLLEXTENSION
+ , "stocservices.uno" SAL_DLLEXTENSION
, SAL_MODULENAME( "fileacc" )
, SAL_MODULENAME( "mcnttype" ) //Clipboard Ask Oliver Braun
, "i18npool.uno" SAL_DLLEXTENSION
diff -ruN cppuhelper.pastbootstrap/qa/propertysetmixin/makefile.mk cppuhelper/qa/propertysetmixin/makefile.mk
--- cppuhelper.pastbootstrap/qa/propertysetmixin/makefile.mk 2007-06-08 10:09:11.000000000 +0200
+++ cppuhelper/qa/propertysetmixin/makefile.mk 2007-06-08 10:17:16.000000000 +0200
@@ -100,7 +100,7 @@
$(REGMERGE) $@ / $(MISC)$/$(TARGET)$/types.rdb
$(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
-c javavm.uno$(DLLPOST) -c reflection.uno$(DLLPOST) \
- -c uriproc.uno$(DLLPOST)
+ -c stocservices.uno$(DLLPOST)
$(REGCOMP) -register -r $@ \
-c $(subst,$/,/ $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST))
$(REGCOMP) -register -br $(MISC)$/$(TARGET)$/bootstrap.rdb -r $@ \
@@ -113,7 +113,7 @@
- $(MKDIR) $(@:d)
$(COPY) $(SOLARBINDIR)$/types.rdb $@
$(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
- -c javavm.uno$(DLLPOST) -c uriproc.uno$(DLLPOST)
+ -c javavm.uno$(DLLPOST) -c stocservices.uno$(DLLPOST)
$(MISC)$/$(TARGET)$/cppumaker.flag: $(MISC)$/$(TARGET)$/types.rdb
$(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -Gc \
diff -ruN pyuno.pastbootstrap/source/loader/makefile.mk pyuno/source/loader/makefile.mk
--- pyuno.pastbootstrap/source/loader/makefile.mk 2007-06-08 10:09:31.000000000 +0200
+++ pyuno/source/loader/makefile.mk 2007-06-08 10:17:16.000000000 +0200
@@ -94,7 +94,7 @@
# pythonloader.uno \
COMPONENTS= \
- typeconverter.uno \
+ stocservices.uno \
invocation.uno \
reflection.uno \
introspection.uno \
diff -ruN scp2.pastbootstrap/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
--- scp2.pastbootstrap/source/ooo/file_library_ooo.scp 2007-06-08 10:09:31.000000000 +0200
+++ scp2/source/ooo/file_library_ooo.scp 2007-06-08 10:17:16.000000000 +0200
@@ -2022,6 +2022,18 @@
#endif
End
+File gid_File_Lib_Stocserv
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Program;
+ #ifdef UNX
+ Name = STRING(CONCAT2(stocservices.uno,UNXSUFFIX));
+ #else
+ Name = "stocservices.uno.dll";
+ #endif
+ Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE,PATCH);
+ RegistryID = gid_Starregistry_Services_Rdb;
+End
+
File gid_File_Lib_Store
TXT_FILE_BODY;
#ifdef UNX
@@ -2079,18 +2091,6 @@
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Macbe, macbe1.uno )
#endif
-File gid_File_Lib_Tcv
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE,PATCH);
- RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
- #ifdef UNX
- Name = STRING(CONCAT2(typeconverter.uno,UNXSUFFIX));
- #else
- Name = "typeconverter.uno.dll";
- #endif
-End
-
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_Tinstrm,textinstream.uno)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Tk, tk )
@@ -2208,18 +2208,6 @@
#endif
-File gid_File_Lib_Uriproc
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
- #ifdef UNX
- Name = STRING(CONCAT2(uriproc.uno,UNXSUFFIX));
- #else
- Name = "uriproc.uno.dll";
- #endif
- Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE,PATCH);
- RegistryID = gid_Starregistry_Services_Rdb;
-End
-
File gid_File_Lib_Urp_Uno
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
diff -ruN scp2.pastbootstrap/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
--- scp2.pastbootstrap/source/ooo/module_hidden_ooo.scp 2007-06-08 10:09:31.000000000 +0200
+++ scp2/source/ooo/module_hidden_ooo.scp 2007-06-08 10:17:16.000000000 +0200
@@ -381,6 +381,7 @@
gid_File_Lib_Sdbc_2,
gid_File_Lib_Srtrs1,
gid_File_Lib_Stlport,
+ gid_File_Lib_Stocserv,
gid_File_Lib_Store,
gid_File_Lib_Bat,
gid_File_Lib_Tab,
@@ -394,10 +395,8 @@
gid_File_Lib_Syssh,
gid_File_Lib_Tinstrm,
gid_File_Lib_Toutstrm,
- gid_File_Lib_Tcv,
gid_File_Ucptdoc1,
gid_File_Ucpexpand1,
- gid_File_Lib_Uriproc,
gid_File_Lib_Uuresolver,
gid_File_Lib_Hunspell,
gid_File_Lib_Portaudio,
diff -ruN solenv.pastbootstrap/bin/modules/installer/globals.pm solenv/bin/modules/installer/globals.pm
--- solenv.pastbootstrap/bin/modules/installer/globals.pm 2007-06-08 10:09:32.000000000 +0200
+++ solenv/bin/modules/installer/globals.pm 2007-06-08 10:17:16.000000000 +0200
@@ -268,7 +268,7 @@
@environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
@packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
@regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar", "commonwizards.jar" );
- @regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "uriproc.uno" );
+ @regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "stocservices.uno" );
@languagepackfeature =();
@featurecollector =();
$msiassemblyfiles = "";
diff -ruN testtools.pastbootstrap/source/bridgetest/makefile.mk testtools/source/bridgetest/makefile.mk
--- testtools.pastbootstrap/source/bridgetest/makefile.mk 2007-06-08 10:09:32.000000000 +0200
+++ testtools/source/bridgetest/makefile.mk 2007-06-08 10:17:16.000000000 +0200
@@ -192,7 +192,7 @@
-c uuresolver.uno$(DLLPOST) \
-c bridgetest.uno$(DLLPOST) \
-c cppobj.uno$(DLLPOST) \
- -c uriproc.uno$(DLLPOST) \
+ -c stocservices.uno$(DLLPOST) \
-c $(SHL3TARGETN:f)
.IF "$(SOLAR_JAVA)" != ""
$(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \
@@ -207,5 +207,5 @@
$(COPY) $(SOLARBINDIR)$/types.rdb $@
.IF "$(SOLAR_JAVA)" != ""
$(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
- -c javavm.uno$(DLLPOST) -c uriproc.uno$(DLLPOST)
+ -c javavm.uno$(DLLPOST) -c stocservices.uno$(DLLPOST)
.ENDIF
diff -ruN stoc.orig/inc/stocservices.hxx stoc/inc/stocservices.hxx
--- stoc.orig/inc/stocservices.hxx 1970-01-01 01:00:00.000000000 +0100
+++ stoc/inc/stocservices.hxx 2007-06-08 12:58:34.000000000 +0100
@@ -0,0 +1,93 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_stoc.hxx"
+
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+
+namespace com { namespace sun { namespace star { namespace uno {
+ class XInterface;
+ class XComponentContext;
+} } } }
+
+namespace stoc_services
+{
+ // typeconv
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & )
+ throw( ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > tcv_getSupportedServiceNames();
+ ::rtl::OUString tcv_getImplementationName();
+
+ namespace ExternalUriReferenceTranslator
+ {
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context)
+ SAL_THROW((com::sun::star::uno::Exception));
+ rtl::OUString SAL_CALL getImplementationName();
+ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
+ }
+
+ namespace UriReferenceFactory
+ {
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context)
+ SAL_THROW((com::sun::star::uno::Exception));
+ rtl::OUString SAL_CALL getImplementationName();
+ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
+ }
+
+ namespace UriSchemeParser_vndDOTsunDOTstarDOTscript
+ {
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &)
+ SAL_THROW((com::sun::star::uno::Exception));
+ rtl::OUString SAL_CALL getImplementationName();
+ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
+ }
+
+ namespace VndSunStarPkgUrlReferenceFactory
+ {
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context)
+ SAL_THROW((com::sun::star::uno::Exception));
+ rtl::OUString SAL_CALL getImplementationName();
+ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
+ }
+} // namespace
diff -ruN stoc.orig/prj/build.lst stoc/prj/build.lst
--- stoc.orig/prj/build.lst 2007-06-08 12:59:06.000000000 +0100
+++ stoc/prj/build.lst 2007-06-08 12:50:00.000000000 +0100
@@ -5,6 +5,7 @@
tc stoc\source\implementationregistration nmake - all tc_ireg tc_boot tc_defr tc_inc NULL
tc stoc\source\loader nmake - all tc_loa tc_boot tc_ireg tc_inc NULL
tc stoc\source\bootstrap nmake - all tc_boot tc_inc NULL
+tc stoc\source\stocservices nmake - all tc_stserv tc_inc NULL
tc stoc\source\servicemanager nmake - all tc_smgr tc_boot tc_loa tc_inc NULL
tc stoc\source\security nmake - all tc_sec tc_boot tc_loa tc_inc NULL
tc stoc\source\simpleregistry nmake - all tc_sreg tc_boot tc_smgr tc_inc NULL
@@ -16,8 +17,8 @@
tc stoc\source\invocation_adapterfactory nmake - all tc_iadapter tc_invocation tc_inc NULL
tc stoc\source\namingservice nmake - all tc_nservice tc_iadapter tc_inc NULL
tc stoc\source\proxy_factory nmake - all tc_proxyfact tc_inc NULL
-tc stoc\source\typeconv nmake - all tc_tcv tc_nservice tc_inc NULL
+tc stoc\source\typeconv nmake - all tc_tcv tc_stserv tc_nservice tc_inc NULL
tc stoc\source\javavm nmake - all tc_jvm tc_inc NULL
tc stoc\source\javaloader nmake - all tc_jvload tc_inc NULL
-tc stoc\source\uriproc nmake - all tc_uriproc tc_inc NULL
-tc stoc\util nmake - all tc_util tc_boot tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng NULL
+tc stoc\source\uriproc nmake - all tc_uriproc tc_stserv tc_inc NULL
+tc stoc\util nmake - all tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng NULL
diff -ruN stoc.orig/prj/d.lst stoc/prj/d.lst
--- stoc.orig/prj/d.lst 2007-06-08 12:59:06.000000000 +0100
+++ stoc/prj/d.lst 2007-06-08 12:50:00.000000000 +0100
@@ -27,5 +27,5 @@
..\source\bootstrap\cpld.xml %_DEST%\xml%_EXT%\shlibloader.uno.xml
..\source\bootstrap\rdbtdp.xml %_DEST%\xml%_EXT%\regtypeprov.uno.xml
..\source\bootstrap\tdmgr.xml %_DEST%\xml%_EXT%\typemgr.uno.xml
-..\source\typeconv\tcv.xml %_DEST%\xml%_EXT%\typeconverter.uno.xml
-..\source\uriproc\module.xml %_DEST%\xml%_EXT%\uriproc.uno.xml
+..\source\stocservices\tcv.xml %_DEST%\xml%_EXT%\typeconverter.uno.xml
+..\source\stocservices\module.xml %_DEST%\xml%_EXT%\uriproc.uno.xml
diff -ruN stoc.orig/source/stocservices/makefile.mk stoc/source/stocservices/makefile.mk
--- stoc.orig/source/stocservices/makefile.mk 1970-01-01 01:00:00.000000000 +0100
+++ stoc/source/stocservices/makefile.mk 2007-06-08 12:50:00.000000000 +0100
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library 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 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME= stocservices
+TARGET = stocservices
+ENABLE_EXCEPTIONS=TRUE
+COMP1TYPELIST = tcv
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# ------------------------------------------------------------------
+
+.INCLUDE : ..$/cppumaker.mk
+
+# --- Files ------------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/stocservices.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff -ruN stoc.orig/source/stocservices/module.xml stoc/source/stocservices/module.xml
--- stoc.orig/source/stocservices/module.xml 1970-01-01 01:00:00.000000000 +0100
+++ stoc/source/stocservices/module.xml 2007-06-08 12:50:00.000000000 +0100
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ OpenOffice.org - a multi-platform office productivity suite
+
+ $RCSfile$
+
+ $Revision$
+
+ last change: $Author$ $Date$
+
+ The Contents of this file are made available subject to
+ the terms of GNU Lesser General Public License Version 2.1.
+
+
+ GNU Lesser General Public License Version 2.1
+ =============================================
+ Copyright 2005 by Sun Microsystems, Inc.
+ 901 San Antonio Road, Palo Alto, CA 94303, USA
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License version 2.1, as published by the Free Software Foundation.
+
+ This library 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 for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ MA 02111-1307 USA
+
+-->
+<!DOCTYPE module-description PUBLIC
+ "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description>
+ <module-name>stocservices.uno</module-name>
+ <component-description>
+ <author>Stephan Bergmann</author>
+ <name>com.sun.star.comp.uri.ExternalUriReferenceTranslator</name>
+ <description>
+ Instances of this service translate between external and internal
+ URI references.
+ </description>
+ <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+ <language>C++</language>
+ <status value="under_construction"/>
+ <supported-service>
+ com.sun.star.uri.ExternalUriReferenceTranslator
+ </supported-service>
+ </component-description>
+ <component-description>
+ <author>Stephan Bergmann</author>
+ <name>com.sun.star.comp.uri.UriReferenceFactory</name>
+ <description>
+ Instances of this service create URI references.
+ </description>
+ <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+ <language>C++</language>
+ <status value="under_construction"/>
+ <supported-service>
+ com.sun.star.uri.UriReferenceFactory
+ </supported-service>
+ </component-description>
+ <component-description>
+ <author>Stephan Bergmann</author>
+ <name>
+ com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
+ </name>
+ <description>
+ Instances of this service parse textual representations of absolute
+ “vnd.sun.star.script” URLs.
+ </description>
+ <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+ <language>C++</language>
+ <status value="under_construction"/>
+ <supported-service>
+ com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
+ </supported-service>
+ </component-description>
+ <component-description>
+ <author>Stephan Bergmann</author>
+ <name>com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory</name>
+ <description>
+ Instances of this service create “vnd.sun.star.pkg”
+ URL references.
+ </description>
+ <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+ <language>C++</language>
+ <status value="under_construction"/>
+ <supported-service>
+ com.sun.star.uri.VndSunStarPkgUrlReferenceFactory
+ </supported-service>
+ </component-description>
+</module-description>
diff -ruN stoc.orig/source/stocservices/stocservices.cxx stoc/source/stocservices/stocservices.cxx
--- stoc.orig/source/stocservices/stocservices.cxx 1970-01-01 01:00:00.000000000 +0100
+++ stoc/source/stocservices/stocservices.cxx 2007-06-08 12:58:21.000000000 +0100
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_stoc.hxx"
+
+#include "stocservices.hxx"
+
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "sal/types.h"
+#include "uno/environment.h"
+#include "uno/lbnames.h"
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace cppu;
+using namespace osl;
+using namespace rtl;
+using namespace stoc_services;
+
+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
+
+static struct ImplementationEntry g_entries[] =
+{
+ // typeconv
+ {
+ TypeConverter_Impl_CreateInstance, tcv_getImplementationName,
+ tcv_getSupportedServiceNames, createSingleComponentFactory,
+ &g_moduleCount.modCnt , 0
+ },
+ // uriproc
+ {
+ ExternalUriReferenceTranslator::create,
+ ExternalUriReferenceTranslator::getImplementationName,
+ ExternalUriReferenceTranslator::getSupportedServiceNames,
+ createSingleComponentFactory, 0, 0
+ },
+ {
+ UriReferenceFactory::create,
+ UriReferenceFactory::getImplementationName,
+ UriReferenceFactory::getSupportedServiceNames,
+ createSingleComponentFactory, 0, 0
+ },
+ {
+ UriSchemeParser_vndDOTsunDOTstarDOTscript::create,
+ UriSchemeParser_vndDOTsunDOTstarDOTscript::getImplementationName,
+ UriSchemeParser_vndDOTsunDOTstarDOTscript::getSupportedServiceNames,
+ createSingleComponentFactory, 0, 0
+ },
+ {
+ VndSunStarPkgUrlReferenceFactory::create,
+ VndSunStarPkgUrlReferenceFactory::getImplementationName,
+ VndSunStarPkgUrlReferenceFactory::getSupportedServiceNames,
+ createSingleComponentFactory, 0, 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+};
+
+extern "C"
+{
+
+sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+{
+ return g_moduleCount.canUnload( &g_moduleCount , pTime );
+}
+
+//==================================================================================================
+void SAL_CALL component_getImplementationEnvironment(
+ const sal_Char ** ppEnvTypeName, uno_Environment ** )
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+//==================================================================================================
+sal_Bool SAL_CALL component_writeInfo(
+ void * pServiceManager, void * pRegistryKey )
+{
+ return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries );
+}
+//==================================================================================================
+void * SAL_CALL component_getFactory(
+ const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+{
+ return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
+}
+
+}
diff -ruN stoc.orig/source/stocservices/tcv.xml stoc/source/stocservices/tcv.xml
--- stoc.orig/source/stocservices/tcv.xml 1970-01-01 01:00:00.000000000 +0100
+++ stoc/source/stocservices/tcv.xml 2007-06-08 12:50:01.000000000 +0100
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+ <module-name> stocservices.uno </module-name>
+ <component-description>
+ <author> Daniel Boelzle </author>
+ <name> com.sun.star.comp.stoc.TypeConverter </name>
+ <description>
+This service provide a widening converter. This means it can convert
+from one type to another if possible.
+</description>
+ <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+ <language> C++ </language>
+ <status value="final"/>
+ <supported-service> com.sun.star.script.Converter </supported-service>
+ <type> com.sun.star.reflection.FieldAccessMode </type>
+ <type> com.sun.star.lang.IllegalArgumentException </type>
+ <type> com.sun.star.lang.XEventListener </type>
+ <type> com.sun.star.lang.XTypeProvider </type>
+ <type> com.sun.star.lang.XServiceInfo </type>
+ <type> com.sun.star.lang.XSingleServiceFactory </type>
+ <type> com.sun.star.lang.XSingleComponentFactory </type>
+ <type> com.sun.star.lang.XMultiServiceFactory </type>
+ <type> com.sun.star.registry.XRegistryKey </type>
+ <type> com.sun.star.script.XTypeConverter </type>
+ <type> com.sun.star.script.FailReason </type>
+ <type> com.sun.star.container.XSet </type>
+ <type> com.sun.star.container.XNameContainer </type>
+ <type> com.sun.star.container.XIndexContainer </type>
+ <type> com.sun.star.uno.XAggregation </type>
+ <type> com.sun.star.uno.XWeak </type>
+ <type> com.sun.star.uno.TypeClass </type>
+ <type> com.sun.star.uno.XComponentContext </type>
+ </component-description>
+ <project-build-dependency> cppuhelper </project-build-dependency>
+ <project-build-dependency> cppu </project-build-dependency>
+ <project-build-dependency> sal </project-build-dependency>
+ <runtime-module-dependency> cppuhelper2(COM) </runtime-module-dependency>
+ <runtime-module-dependency> cppu2 </runtime-module-dependency>
+ <runtime-module-dependency> sal2 </runtime-module-dependency>
+</module-description>
diff -ruN stoc.orig/source/typeconv/convert.cxx stoc/source/typeconv/convert.cxx
--- stoc.orig/source/typeconv/convert.cxx 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/typeconv/convert.cxx 2007-06-08 12:50:01.000000000 +0100
@@ -70,6 +70,42 @@
#define IMPLNAME "com.sun.star.comp.stoc.TypeConverter"
+extern rtl_StandardModuleCount g_moduleCount;
+
+namespace stoc_services
+{
+Sequence< OUString > tcv_getSupportedServiceNames()
+{
+ static Sequence < OUString > *pNames = 0;
+ if( ! pNames )
+ {
+ MutexGuard guard( Mutex::getGlobalMutex() );
+ if( !pNames )
+ {
+ static Sequence< OUString > seqNames(1);
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+ pNames = &seqNames;
+ }
+ }
+ return *pNames;
+}
+
+OUString tcv_getImplementationName()
+{
+ static OUString *pImplName = 0;
+ if( ! pImplName )
+ {
+ MutexGuard guard( Mutex::getGlobalMutex() );
+ if( ! pImplName )
+ {
+ static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
+ pImplName = &implName;
+ }
+ }
+ return *pImplName;
+}
+}
+
namespace stoc_tcv
{
@@ -101,39 +137,6 @@
#endif
-static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
-static Sequence< OUString > tcv_getSupportedServiceNames()
-{
- static Sequence < OUString > *pNames = 0;
- if( ! pNames )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( !pNames )
- {
- static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
- pNames = &seqNames;
- }
- }
- return *pNames;
-}
-
-static OUString tcv_getImplementationName()
-{
- static OUString *pImplName = 0;
- if( ! pImplName )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( ! pImplName )
- {
- static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
- pImplName = &implName;
- }
- }
- return *pImplName;
-}
-
//--------------------------------------------------------------------------------------------------
static inline double round( double aVal )
{
@@ -331,7 +334,7 @@
// XServiceInfo
OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException )
{
- return tcv_getImplementationName();
+ return stoc_services::tcv_getImplementationName();
}
// XServiceInfo
@@ -348,7 +351,7 @@
// XServiceInfo
Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames(void) throw( RuntimeException )
{
- return tcv_getSupportedServiceNames();
+ return stoc_services::tcv_getSupportedServiceNames();
}
//--------------------------------------------------------------------------------------------------
@@ -952,57 +955,17 @@
OUString( RTL_CONSTASCII_USTRINGPARAM("conversion not possible!") ),
Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 );
}
+}
+namespace stoc_services
+{
//*************************************************************************
Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
const Reference< XComponentContext > & )
throw( RuntimeException )
{
- static Reference< XInterface > s_ref( (OWeakObject *) new TypeConverter_Impl() );
+ static Reference< XInterface > s_ref( (OWeakObject *) new stoc_tcv::TypeConverter_Impl() );
return s_ref;
}
-
-}
-
-
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
-using namespace stoc_tcv;
-
-static struct ImplementationEntry g_entries[] =
-{
- {
- TypeConverter_Impl_CreateInstance, tcv_getImplementationName,
- tcv_getSupportedServiceNames, createSingleComponentFactory,
- &g_moduleCount.modCnt , 0
- },
- { 0, 0, 0, 0, 0, 0 }
-};
-
-extern "C"
-{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
-{
- return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
-//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey )
-{
- return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries );
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
-}
-}
diff -ruN stoc.orig/source/typeconv/makefile.mk stoc/source/typeconv/makefile.mk
--- stoc.orig/source/typeconv/makefile.mk 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/typeconv/makefile.mk 2007-06-08 12:50:01.000000000 +0100
@@ -35,9 +35,8 @@
PRJ=..$/..
PRJNAME=stoc
-TARGET = typeconverter.uno
+TARGET = typeconverter
ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = tcv
# --- Settings -----------------------------------------------------
@@ -51,21 +50,6 @@
SLOFILES= \
$(SLO)$/convert.obj
-SHL1TARGET= $(TARGET)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1VERSIONMAP = tcv.map
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff -ruN stoc.orig/source/uriproc/ExternalUriReferenceTranslator.cxx stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
--- stoc.orig/source/uriproc/ExternalUriReferenceTranslator.cxx 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/ExternalUriReferenceTranslator.cxx 2007-06-08 12:50:02.000000000 +0100
@@ -36,7 +36,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
-#include "ExternalUriReferenceTranslator.hxx"
+#include "stocservices.hxx"
#include "supportsService.hxx"
@@ -103,7 +103,7 @@
throw (css::uno::RuntimeException)
{
return
- stoc::uriproc::ExternalUriReferenceTranslator::getImplementationName();
+ stoc_services::ExternalUriReferenceTranslator::getImplementationName();
}
sal_Bool Translator::supportsService(rtl::OUString const & serviceName)
@@ -116,7 +116,7 @@
css::uno::Sequence< rtl::OUString > Translator::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::ExternalUriReferenceTranslator::
+ return stoc_services::ExternalUriReferenceTranslator::
getSupportedServiceNames();
}
@@ -215,7 +215,7 @@
}
-namespace stoc { namespace uriproc { namespace ExternalUriReferenceTranslator {
+namespace stoc_services { namespace ExternalUriReferenceTranslator {
css::uno::Reference< css::uno::XInterface > create(
css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -241,4 +241,4 @@
return s;
}
-} } }
+} }
diff -ruN stoc.orig/source/uriproc/makefile.mk stoc/source/uriproc/makefile.mk
--- stoc.orig/source/uriproc/makefile.mk 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/makefile.mk 2007-06-08 12:55:00.000000000 +0100
@@ -43,20 +43,14 @@
DLLPRE = # no leading "lib" on .so files
-SHL1TARGET = $(TARGET).uno
-SHL1OBJS = \
+.INCLUDE : ..$/cppumaker.mk
+
+SLOFILES = \
$(SLO)$/ExternalUriReferenceTranslator.obj \
$(SLO)$/UriReference.obj \
$(SLO)$/UriReferenceFactory.obj \
$(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTscript.obj \
$(SLO)$/VndSunStarPkgUrlReferenceFactory.obj \
- $(SLO)$/component.obj \
$(SLO)$/supportsService.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
diff -ruN stoc.orig/source/uriproc/module.xml stoc/source/uriproc/module.xml
--- stoc.orig/source/uriproc/module.xml 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/module.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile$
-
- $Revision$
-
- last change: $Author$ $Date$
-
- The Contents of this file are made available subject to
- the terms of GNU Lesser General Public License Version 2.1.
-
-
- GNU Lesser General Public License Version 2.1
- =============================================
- Copyright 2005 by Sun Microsystems, Inc.
- 901 San Antonio Road, Palo Alto, CA 94303, USA
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License version 2.1, as published by the Free Software Foundation.
-
- This library 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 for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
-
--->
-<!DOCTYPE module-description PUBLIC
- "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description>
- <module-name>uriproc.uno</module-name>
- <component-description>
- <author>Stephan Bergmann</author>
- <name>com.sun.star.comp.uri.ExternalUriReferenceTranslator</name>
- <description>
- Instances of this service translate between external and internal
- URI references.
- </description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>C++</language>
- <status value="under_construction"/>
- <supported-service>
- com.sun.star.uri.ExternalUriReferenceTranslator
- </supported-service>
- </component-description>
- <component-description>
- <author>Stephan Bergmann</author>
- <name>com.sun.star.comp.uri.UriReferenceFactory</name>
- <description>
- Instances of this service create URI references.
- </description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>C++</language>
- <status value="under_construction"/>
- <supported-service>
- com.sun.star.uri.UriReferenceFactory
- </supported-service>
- </component-description>
- <component-description>
- <author>Stephan Bergmann</author>
- <name>
- com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
- </name>
- <description>
- Instances of this service parse textual representations of absolute
- “vnd.sun.star.script” URLs.
- </description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>C++</language>
- <status value="under_construction"/>
- <supported-service>
- com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
- </supported-service>
- </component-description>
- <component-description>
- <author>Stephan Bergmann</author>
- <name>com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory</name>
- <description>
- Instances of this service create “vnd.sun.star.pkg”
- URL references.
- </description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>C++</language>
- <status value="under_construction"/>
- <supported-service>
- com.sun.star.uri.VndSunStarPkgUrlReferenceFactory
- </supported-service>
- </component-description>
-</module-description>
diff -ruN stoc.orig/source/uriproc/UriReferenceFactory.cxx stoc/source/uriproc/UriReferenceFactory.cxx
--- stoc.orig/source/uriproc/UriReferenceFactory.cxx 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/UriReferenceFactory.cxx 2007-06-08 12:50:02.000000000 +0100
@@ -36,7 +36,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
-#include "UriReferenceFactory.hxx"
+#include "stocservices.hxx"
#include "UriReference.hxx"
#include "supportsService.hxx"
@@ -363,7 +363,7 @@
rtl::OUString Factory::getImplementationName()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::UriReferenceFactory::getImplementationName();
+ return stoc_services::UriReferenceFactory::getImplementationName();
}
sal_Bool Factory::supportsService(rtl::OUString const & serviceName)
@@ -376,7 +376,7 @@
css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::UriReferenceFactory::getSupportedServiceNames();
+ return stoc_services::UriReferenceFactory::getSupportedServiceNames();
}
css::uno::Reference< css::uri::XUriReference > Factory::parse(
@@ -703,7 +703,7 @@
}
-namespace stoc { namespace uriproc { namespace UriReferenceFactory {
+namespace stoc_services { namespace UriReferenceFactory {
css::uno::Reference< css::uno::XInterface > create(
css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -729,4 +729,4 @@
return s;
}
-} } }
+} }
diff -ruN stoc.orig/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
--- stoc.orig/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx 2007-06-08 12:50:03.000000000 +0100
@@ -36,7 +36,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
-#include "UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx"
+#include "stocservices.hxx"
#include "UriReference.hxx"
#include "supportsService.hxx"
@@ -347,7 +347,7 @@
rtl::OUString Parser::getImplementationName()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::UriSchemeParser_vndDOTsunDOTstarDOTscript::
+ return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
getImplementationName();
}
@@ -361,7 +361,7 @@
css::uno::Sequence< rtl::OUString > Parser::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::UriSchemeParser_vndDOTsunDOTstarDOTscript::
+ return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
getSupportedServiceNames();
}
@@ -383,7 +383,7 @@
}
-namespace stoc { namespace uriproc {
+namespace stoc_services {
namespace UriSchemeParser_vndDOTsunDOTstarDOTscript {
css::uno::Reference< css::uno::XInterface > create(
@@ -411,4 +411,4 @@
return s;
}
-} } }
+} }
diff -ruN stoc.orig/source/uriproc/version.map stoc/source/uriproc/version.map
--- stoc.orig/source/uriproc/version.map 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/version.map 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile$
-#
-# $Revision$
-#
-# last change: $Author$ $Date$
-#
-# The Contents of this file are made available subject to
-# the terms of GNU Lesser General Public License Version 2.1.
-#
-#
-# GNU Lesser General Public License Version 2.1
-# =============================================
-# Copyright 2005 by Sun Microsystems, Inc.
-# 901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License version 2.1, as published by the Free Software Foundation.
-#
-# This library 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 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- component_getFactory;
- component_getImplementationEnvironment;
- component_writeInfo;
-
- local:
- *;
-};
diff -ruN stoc.orig/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
--- stoc.orig/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx 2007-06-08 12:59:07.000000000 +0100
+++ stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx 2007-06-08 12:50:03.000000000 +0100
@@ -36,7 +36,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
-#include "VndSunStarPkgUrlReferenceFactory.hxx"
+#include "stocservices.hxx"
#include "supportsService.hxx"
@@ -102,7 +102,7 @@
throw (css::uno::RuntimeException)
{
return
- stoc::uriproc::VndSunStarPkgUrlReferenceFactory::
+ stoc_services::VndSunStarPkgUrlReferenceFactory::
getImplementationName();
}
@@ -116,7 +116,7 @@
css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- return stoc::uriproc::VndSunStarPkgUrlReferenceFactory::
+ return stoc_services::VndSunStarPkgUrlReferenceFactory::
getSupportedServiceNames();
}
@@ -145,7 +145,7 @@
}
-namespace stoc { namespace uriproc { namespace VndSunStarPkgUrlReferenceFactory
+namespace stoc_services { namespace VndSunStarPkgUrlReferenceFactory
{
css::uno::Reference< css::uno::XInterface > create(
@@ -172,4 +172,4 @@
return s;
}
-} } }
+} }
diff -ruN stoc.orig/test/testconv.cxx stoc/test/testconv.cxx
--- stoc.orig/test/testconv.cxx 2007-06-08 12:59:06.000000000 +0100
+++ stoc/test/testconv.cxx 2007-06-08 12:50:03.000000000 +0100
@@ -692,7 +692,7 @@
OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
OUString aLibName(
- RTL_CONSTASCII_USTRINGPARAM("typeconverter.uno" SAL_DLLEXTENSION) );
+ RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) );
xImplReg->registerImplementation(
OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
aLibName, Reference< XSimpleRegistry >() );
diff -ruN stoc.orig/test/testiadapter.cxx stoc/test/testiadapter.cxx
--- stoc.orig/test/testiadapter.cxx 2007-06-08 12:59:06.000000000 +0100
+++ stoc/test/testiadapter.cxx 2007-06-08 12:50:03.000000000 +0100
@@ -1040,7 +1040,7 @@
Reference< XSimpleRegistry >() );
xImplReg->registerImplementation(
OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
- OUString::createFromAscii("typeconverter.uno" SAL_DLLEXTENSION),
+ OUString::createFromAscii("stocservices.uno" SAL_DLLEXTENSION),
Reference< XSimpleRegistry >() );
xImplReg->registerImplementation(
OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
diff -ruN stoc.orig/test/uriproc/makefile.mk stoc/test/uriproc/makefile.mk
--- stoc.orig/test/uriproc/makefile.mk 2007-06-08 12:59:06.000000000 +0100
+++ stoc/test/uriproc/makefile.mk 2007-06-08 12:57:41.000000000 +0100
@@ -72,7 +72,7 @@
$(BIN)$/$(TARGET).rdb .ERRREMOVE:
+ $(COPY) $(SOLARBINDIR)$/types.rdb $@
- regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/uriproc.uno$(DLLPOST))
+ regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/stocservices.uno$(DLLPOST))
test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).rdb
testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
diff -ruN stoc.orig/util/makefile.mk stoc/util/makefile.mk
--- stoc.orig/util/makefile.mk 2007-06-08 12:59:07.000000000 +0100
+++ stoc/util/makefile.mk 2007-06-08 12:50:03.000000000 +0100
@@ -74,6 +74,28 @@
DEF1NAME= $(SHL1TARGET)
+SHL2TARGET= stocservices.uno
+
+LIB2TARGET= $(SLB)$/stocservices.uno.lib
+LIB2FILES= \
+ $(SLB)$/stocservices.lib \
+ $(SLB)$/typeconverter.lib \
+ $(SLB)$/uriproc.lib
+
+SHL2VERSIONMAP = stocservices.map
+
+SHL2STDLIBS= \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(SALLIB)
+
+SHL2DEPN=
+SHL2IMPLIB= istocservices.uno
+SHL2LIBS= $(SLB)$/stocservices.uno.lib
+SHL2DEF= $(MISC)$/$(SHL2TARGET).def
+
+DEF2NAME= $(SHL2TARGET)
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff -ruN stoc.orig/util/stocservices.map stoc/util/stocservices.map
--- stoc.orig/util/stocservices.map 1970-01-01 01:00:00.000000000 +0100
+++ stoc/util/stocservices.map 2007-06-08 12:50:03.000000000 +0100
@@ -0,0 +1,10 @@
+UDK_3_0_0 {
+ global:
+ component_getImplementationEnvironment;
+ component_writeInfo;
+ component_getFactory;
+ component_canUnload;
+ component_getDescriptionFunc;
+ local:
+ *;
+};
diff -ruN instsetoo_native.orig/util/makefile.mk instsetoo_native/util/makefile.mk
--- instsetoo_native.orig/util/makefile.mk 2007-06-08 13:01:42.000000000 +0100
+++ instsetoo_native/util/makefile.mk 2007-06-08 12:51:14.000000000 +0100
@@ -434,10 +434,7 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textoutstream.uno$(DLLPOST)$(MY_Q) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
- $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typeconverter.uno$(DLLPOST)$(MY_Q) \
- -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
- + $(REGCOMP) -register -r $@ -c \
- $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uriproc.uno$(DLLPOST)$(MY_Q) \
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/stocservices.uno$(DLLPOST)$(MY_Q) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uuresolver.uno$(DLLPOST)$(MY_Q) \
diff -ruN bridges.orig/test/java_uno/nativethreadpool/makefile.mk bridges/test/java_uno/nativethreadpool/makefile.mk
--- bridges.orig/test/java_uno/nativethreadpool/makefile.mk 2007-06-08 13:02:59.000000000 +0100
+++ bridges/test/java_uno/nativethreadpool/makefile.mk 2007-06-08 12:50:45.000000000 +0100
@@ -100,11 +100,11 @@
-c bridgefac.uno$(DLLPOST) -c connector.uno$(DLLPOST) \
-c remotebridge.uno$(DLLPOST) -c uuresolver.uno$(DLLPOST) \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
- -c uriproc.uno$(DLLPOST)
+ -c stocservices.uno$(DLLPOST)
cp $(SOLARBINDIR)$/types.rdb $(MISC)$/$(TARGET)$/bootstrap.rdb
regcomp -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
- -c uriproc.uno$(DLLPOST)
+ -c stocservices.uno$(DLLPOST)
.IF "$(GUI)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -r1.1201 -r1.1202
--- openoffice.org.spec 8 Jun 2007 10:45:40 -0000 1.1201
+++ openoffice.org.spec 8 Jun 2007 11:09:46 -0000 1.1202
@@ -140,8 +140,9 @@
Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
Patch76: openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
-Patch77: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch78: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
+Patch77: openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
+Patch78: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch79: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
%define instdir %{_libdir}/openoffice.org
@@ -1077,9 +1078,10 @@
%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
%if %{linkopt}
%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
+%patch77 -p0 -b .ooo77885.stoc.nonbootstrap.patch
%endif
-%patch77 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch78 -p1 -b .ooo78198.sixtyfour.svx.patch
+%patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
More information about the fedora-extras-commits
mailing list