rpms/openoffice.org/F-7 openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch, NONE, 1.1 openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch, NONE, 1.1 openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch, NONE, 1.1 openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch, NONE, 1.1 openoffice.org.ooo79953.dbusinhibitscreensaver.patch, NONE, 1.1 .cvsignore, 1.127, 1.128 ooobuild.VBAObjects.patch, 1.14, 1.15 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.18, 1.19 openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.13, 1.14 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.31, 1.32 openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch, 1.5, 1.6 openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.11, 1.12 openoffice.org-simple-crash_report.sh, 1.3, 1.4 openoffice.org.spec, 1.1188, 1.1189 pseudoworkspace.valgrind1.patch, 1.17, 1.18 sources, 1.238, 1.239 workspace.configrefactor01.patch, 1.1, 1.2 openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch, 1.2, NONE workspace.cmcfixes32.patch, 1.2, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Jul 26 20:17:25 UTC 2007
- Previous message (by thread): rpms/xfsdump/F-7 .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message (by thread): rpms/openoffice.org/F-7 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, NONE, 1.1 openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, NONE, 1.1 workspace.ppc64one.patch, NONE, 1.1 openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.2, NONE openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch, 1.4, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19599
Modified Files:
.cvsignore ooobuild.VBAObjects.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
openoffice.org-2.2.0.ooo53397.linkopt.patch
openoffice.org-simple-crash_report.sh openoffice.org.spec
pseudoworkspace.valgrind1.patch sources
workspace.configrefactor01.patch
Added Files:
openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
openoffice.org.ooo79953.dbusinhibitscreensaver.patch
Removed Files:
openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
workspace.cmcfixes32.patch
Log Message:
bump to 2.2.1
openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch:
--- NEW FILE openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch ---
Index: source/deployment/gui/dp_gui_updatedialog.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/deployment/gui/dp_gui_updatedialog.cxx,v
retrieving revision 1.2.14.1
diff -u -r1.2.14.1 dp_gui_updatedialog.cxx
--- openoffice.org.orig/desktop/source/deployment/gui/dp_gui_updatedialog.cxx 26 Jan 2007 11:52:14 -0000 1.2.14.1
+++ openoffice.org/desktop/source/deployment/gui/dp_gui_updatedialog.cxx 24 May 2007 13:45:24 -0000
@@ -495,7 +495,7 @@
package->getUpdateInformationURLs());
if (urls.getLength() == 0) {
map->insert(
- std::pair< Map::key_type const, Map::data_type >(
+ std::pair< Map::key_type const, Map::mapped_type >(
id, Entry(package, packageManager, package->getVersion())));
} else {
css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch:
--- NEW FILE openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.229
diff -u -r1.229 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 3 Jul 2007 14:05:45 -0000 1.229
+++ openoffice.org/vcl/source/gdi/outdev3.cxx 24 Jul 2007 12:18:54 -0000
@@ -7155,6 +7155,7 @@
aFontInfo.SetPitch( rData.mePitch );
aFontInfo.SetWeight( rData.meWeight );
aFontInfo.SetItalic( rData.meItalic );
+ aFontInfo.SetWidthType( rData.meWidthType );
if( rData.IsScalable() )
aFontInfo.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG;
if( rData.mbDevice )
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch ---
Index: cli_ure/source/climaker/climaker_app.cxx
===================================================================
RCS file: /cvs/udk/cli_ure/source/climaker/climaker_app.cxx,v
retrieving revision 1.13
diff -u -r1.13 climaker_app.cxx
--- cli_ure/source/climaker/climaker_app.cxx 5 Dec 2006 11:18:01 -0000 1.13
+++ cli_ure/source/climaker/climaker_app.cxx 29 May 2007 07:30:34 -0000
@@ -481,7 +481,7 @@
// get rdb tdprovider factory
Reference< lang::XSingleComponentFactory > xTDprov_factory(
::cppu::loadSharedLibComponentFactory(
- OUSTR("regtypeprov.uno" SAL_DLLEXTENSION), OUString(),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), OUString(),
OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
Reference< lang::XMultiServiceFactory >(
xContext->getServiceManager(), UNO_QUERY ),
@@ -490,7 +490,7 @@
{
throw RuntimeException(
OUSTR("cannot get registry typedescription provider: "
- "regtypeprov.uno" SAL_DLLEXTENSION "!"),
+ "bootstrap.uno" SAL_DLLEXTENSION "!"),
Reference< XInterface >() );
}
Index: testtools/source/bridgetest/pyuno/main.py
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/pyuno/main.py,v
retrieving revision 1.3
diff -u -r1.3 main.py
--- testtools/source/bridgetest/pyuno/main.py 9 Sep 2005 12:26:52 -0000 1.3
+++ testtools/source/bridgetest/pyuno/main.py 29 May 2007 07:30:55 -0000
@@ -42,7 +42,7 @@
ctx = uno.getComponentContext()
# needed for the tests
-unohelper.addComponentsToContext(ctx,ctx,("cppobj.uno","bridgetest.uno","streams.uno","servicemgr.uno"),"com.sun.star.loader.SharedLibrary")
+unohelper.addComponentsToContext(ctx,ctx,("cppobj.uno","bridgetest.uno","streams.uno","bootstrap.uno"),"com.sun.star.loader.SharedLibrary")
unohelper.addComponentsToContext(ctx,ctx,("vnd.openoffice.pymodule:samplecomponent",),"com.sun.star.loader.Python")
Index: xmlsecurity/tools/demo/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/tools/demo/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- xmlsecurity/tools/demo/makefile.mk 9 Mar 2007 08:44:43 -0000 1.11
+++ xmlsecurity/tools/demo/makefile.mk 29 May 2007 07:54:51 -0000
@@ -146,10 +146,9 @@
$(JAVACLASSFILES) : $(JAVAFILES)
REGISTERLIBS= \
- shlibloader.uno$(DLLPOST) \
dynamicloader.uno$(DLLPOST) \
namingservice.uno$(DLLPOST) \
- servicemgr.uno$(DLLPOST) \
+ bootstrap.uno$(DLLPOST) \
sax.uno$(DLLPOST) \
$(DLLPRE)mozab2$(DLLPOST)
Index: xmlsecurity/tools/standalone/csfit/util/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/tools/standalone/csfit/util/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- xmlsecurity/tools/standalone/csfit/util/makefile.mk 25 Jan 2007 13:24:45 -0000 1.3
+++ xmlsecurity/tools/standalone/csfit/util/makefile.mk 29 May 2007 07:30:58 -0000
@@ -70,18 +70,12 @@
# Additional libraries
DLLPRE_NO=
REGISTERLIBS+= \
- $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \
$(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \
$(DLLPRE_NO)namingservice.uno$(DLLPOST) \
- $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \
+ $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \
$(DLLPRE)xsec_fw$(DLLPOST) \
$(DLLPRE)xsec_xmlsec$(DLLPOST)
-# $(DLLPRE)implreg.uno$(DLLPOST) \
-# $(DLLPRE)nestedreg.uno$(DLLPOST) \
-# $(DLLPRE)simplereg.uno$(DLLPOST) \
-
-
.IF "$(GUI)" == "UNX"
MY_DLLDIR=$(SOLARLIBDIR)
REGISTERLIBS+= \
Index: xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- xmlsecurity/tools/standalone/mscsfit/util/makefile.mk 25 Jan 2007 13:24:58 -0000 1.3
+++ xmlsecurity/tools/standalone/mscsfit/util/makefile.mk 29 May 2007 07:30:58 -0000
@@ -70,18 +70,12 @@
# Additional libraries
DLLPRE_NO=
REGISTERLIBS+= \
- $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \
$(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \
$(DLLPRE_NO)namingservice.uno$(DLLPOST) \
- $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \
+ $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \
$(DLLPRE)xsec_fw$(DLLPOST) \
$(DLLPRE)xsec_xmlsec$(DLLPOST)
-# $(DLLPRE)implreg.uno$(DLLPOST) \
-# $(DLLPRE)nestedreg.uno$(DLLPOST) \
-# $(DLLPRE)simplereg.uno$(DLLPOST) \
-
-
.IF "$(GUI)" == "UNX"
MY_DLLDIR=$(SOLARLIBDIR)
REGISTERLIBS+= \
diff -ruN stoc.orig/inc/bootstrapservices.hxx stoc/inc/bootstrapservices.hxx
--- stoc.orig/inc/bootstrapservices.hxx 1970-01-01 01:00:00.000000000 +0100
+++ stoc/inc/bootstrapservices.hxx 2007-06-08 12:03:41.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 <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_bootstrap
+{
+ //servicemanager
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManager_CreateInstance(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext );
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_wrapper_getSupportedServiceNames();
+ ::rtl::OUString smgr_wrapper_getImplementationName();
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManagerWrapper_CreateInstance(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext )
+ throw (::com::sun::star::uno::Exception);
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_getSupportedServiceNames();
+ ::rtl::OUString smgr_getImplementationName();
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ORegistryServiceManager_CreateInstance(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext )
+ throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > regsmgr_getSupportedServiceNames();
+ ::rtl::OUString regsmgr_getImplementationName();
+
+ //security
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ac_create(
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext )
+ SAL_THROW( (::com::sun::star::uno::Exception) );
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > ac_getSupportedServiceNames() SAL_THROW( () );
+ ::rtl::OUString ac_getImplementationName() SAL_THROW( () );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL filepolicy_create(
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext )
+ SAL_THROW( (Exception) );
+ ::com::sun::star::uno::Sequence< rtl::OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () );
+ ::rtl::OUString filepolicy_getImplementationName() SAL_THROW( () );
+
+ //defaultregistry
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL NestedRegistry_CreateInstance(
[...3304 lines suppressed...]
- gid_File_Lib_Defreg,
+ gid_File_Lib_Bootstrap,
gid_File_Lib_Corefl,
- gid_File_Lib_Cpld,
gid_File_Lib_Adabas_2,
gid_File_Lib_Cached1,
gid_File_Lib_Curl,
@@ -304,7 +303,6 @@
gid_File_Lib_Localedata_Es,
gid_File_Lib_Localedata_Euro,
gid_File_Lib_Localedata_Others,
- gid_File_Lib_Impreg,
gid_File_Lib_Insp,
gid_File_Lib_Inv,
gid_File_Lib_Invadp,
@@ -343,11 +341,7 @@
gid_File_Lib_Sal,
gid_File_Lib_Salhelper,
gid_File_Lib_Proxyfac,
- gid_File_Lib_Rdbtdp,
gid_File_Lib_Sax,
- gid_File_Lib_Sec,
- gid_File_Lib_Smgr,
- gid_File_Lib_Simreg,
gid_File_Lib_Slideshow,
gid_File_Lib_Stm,
gid_File_Lib_Recentfile,
@@ -369,7 +363,6 @@
gid_File_Lib_Tinstrm,
gid_File_Lib_Toutstrm,
gid_File_Lib_Tcv,
- gid_File_Lib_Tdmgr,
gid_File_Ucptdoc1,
gid_File_Ucpexpand1,
gid_File_Lib_Uriproc,
diff -ruN instsetoo_native.orig/util/makefile.mk instsetoo_native/util/makefile.mk
--- instsetoo_native.orig/util/makefile.mk 2007-06-08 12:17:56.000000000 +0100
+++ instsetoo_native/util/makefile.mk 2007-06-08 12:07:03.000000000 +0100
@@ -393,7 +393,7 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/connector.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/implreg.uno$(DLLPOST)$(MY_Q) \
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/bootstrap.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/introspection.uno$(DLLPOST)$(MY_Q) \
@@ -416,33 +416,15 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/namingservice.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/nestedreg.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/proxyfac.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/reflection.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/regtypeprov.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/remotebridge.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/security.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/servicemgr.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/shlibloader.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/simplereg.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/streams.uno$(DLLPOST)$(MY_Q) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
@@ -455,9 +437,6 @@
$(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/typemgr.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) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
diff -ruN cppuhelper.orig/source/bootstrap.cxx cppuhelper/source/bootstrap.cxx
--- cppuhelper.orig/source/bootstrap.cxx 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/source/bootstrap.cxx 2007-06-08 12:03:41.000000000 +0100
@@ -398,7 +398,7 @@
Reference<registry::XRegistryKey> xEmptyKey;
Reference<lang::XSingleServiceFactory> xSimRegFac(
loadSharedLibComponentFactory(
- OUSTR("simplereg.uno" SAL_DLLEXTENSION), bootstrapPath,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.SimpleRegistry"),
smgr_XMultiServiceFactory,
xEmptyKey),
@@ -406,7 +406,7 @@
Reference<lang::XSingleServiceFactory> xNesRegFac(
loadSharedLibComponentFactory(
- OUSTR("nestedreg.uno" SAL_DLLEXTENSION), bootstrapPath,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.NestedRegistry"),
smgr_XMultiServiceFactory,
xEmptyKey),
diff -ruN cppuhelper.orig/source/servicefactory.cxx cppuhelper/source/servicefactory.cxx
--- cppuhelper.orig/source/servicefactory.cxx 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/source/servicefactory.cxx 2007-06-08 12:03:41.000000000 +0100
@@ -126,7 +126,7 @@
return Reference< registry::XSimpleRegistry >(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("simplereg.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.SimpleRegistry"),
@@ -157,7 +157,7 @@
return Reference< registry::XSimpleRegistry >(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("nestedreg.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.NestedRegistry"),
@@ -340,7 +340,7 @@
Reference< lang::XMultiComponentFactory > xMgr(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("servicemgr.uno" SAL_DLLEXTENSION), bootstrap_path,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrap_path,
OUSTR("com.sun.star.comp.stoc.ORegistryServiceManager"),
Reference< lang::XMultiServiceFactory >(),
Reference< registry::XRegistryKey >() ) ),
@@ -348,21 +348,21 @@
// add initial bootstrap services
static char const * ar[] = {
- "servicemgr.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.OServiceManagerWrapper",
- "shlibloader.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.DLLComponentLoader",
- "simplereg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.SimpleRegistry",
- "nestedreg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.NestedRegistry",
- "typemgr.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.TypeDescriptionManager",
- "implreg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.ImplementationRegistration",
- "security.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.AccessController",
- "security.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.FilePolicy",
0
};
@@ -498,7 +498,7 @@
// add registry td provider factory to smgr and instance to tdmgr
Reference< lang::XSingleComponentFactory > xFac(
loadSharedLibComponentFactory(
- OUSTR("regtypeprov.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
diff -ruN cppuhelper.orig/test/makefile.mk cppuhelper/test/makefile.mk
--- cppuhelper.orig/test/makefile.mk 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/test/makefile.mk 2007-06-08 12:04:53.000000000 +0100
@@ -152,14 +152,7 @@
+regmerge $@ / $(UNOUCRRDB)
+regcomp -register -r $@ -c reflection.uno$(DLLPOST)
touch $@
- +$(COPY) $(UNO_PATH)$/servicemgr.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/shlibloader.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/simplereg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/nestedreg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/typemgr.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/regtypeprov.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/implreg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/security.uno* $(UNO_OUT)
+ +$(COPY) $(UNO_PATH)$/bootstrap.uno* $(UNO_OUT)
unoheader: $(BIN)$/cpputest.rdb
+cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
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
openoffice.org.ooo79953.dbusinhibitscreensaver.patch:
--- NEW FILE openoffice.org.ooo79953.dbusinhibitscreensaver.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.213
diff -u -r1.213 configure.in
--- openoffice.org.orig/config_office/configure.in 3 Jul 2007 12:15:43 -0000 1.213
+++ openoffice.org/config_office/configure.in 24 Jul 2007 09:20:00 -0000
@@ -208,6 +208,10 @@
[ --enable-cairo Determines whether to use Cairo canvas backend on
platforms where Cairo is available.
],,enable_cairo=no)
+AC_ARG_ENABLE(dbus,
+[ --enable-dbus Determines whether to enable presentation mode
+ screensaver control under GNOME via DBUS
+],,enable_dbus=no)
AC_ARG_ENABLE(gnome-vfs,
[ --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing
System on platforms where that VFS is available
@@ -4679,6 +4683,7 @@
GTK_CFLAGS=""
GTK_LIBS=""
ENABLE_SYSTRAY_GTK=""
+ENABLE_DBUS=""
if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE" ; then
@@ -4689,6 +4694,15 @@
ENABLE_SYSTRAY_GTK="TRUE"
BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
fi
+
+ AC_MSG_CHECKING([whether to enable DBUS support])
+ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
+ ENABLE_DBUS="TRUE"
+ AC_MSG_RESULT([yes])
+ PKG_CHECK_MODULES( DBUS, dbus-glib-1 >= 0.70 )
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
if test "$ENABLE_HEADLESS" = "TRUE" ; then
@@ -4696,6 +4710,7 @@
fi
fi
+AC_SUBST(ENABLE_DBUS)
AC_SUBST(ENABLE_SYSTRAY_GTK)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.152
diff -u -r1.152 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 27 Jun 2007 17:52:06 -0000 1.152
+++ openoffice.org/config_office/set_soenv.in 24 Jul 2007 09:20:02 -0000
@@ -1546,6 +1546,7 @@
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
+ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
? unxlngx6.pro
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.64
diff -u -r1.64 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 27 Jun 2007 20:38:26 -0000 1.64
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 24 Jul 2007 09:16:25 -0000
@@ -69,6 +69,14 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#ifdef ENABLE_DBUS
+#include <dbus/dbus-glib.h>
+
+#define GSS_DBUS_SERVICE "org.gnome.ScreenSaver"
+#define GSS_DBUS_PATH "/org/gnome/ScreenSaver"
+#define GSS_DBUS_INTERFACE "org.gnome.ScreenSaver"
+#endif
+
using namespace com::sun::star;
int GtkSalFrame::m_nFloats = 0;
@@ -509,6 +517,7 @@
m_pIMHandler = NULL;
m_hBackgroundPixmap = None;
m_nSavedScreenSaverTimeout = 0;
+ m_nGSSCookie = 0;
m_nExtStyle = 0;
m_pRegion = NULL;
m_ePointerStyle = 0xffff;
@@ -1680,6 +1689,115 @@
sizeof( nMessage ) );
}
+#ifdef ENABLE_DBUS
+/** cookie is returned as an unsigned integer */
+static guint
+dbus_inhibit_gss (const gchar *appname,
+ const gchar *reason)
+{
+ gboolean res;
+ guint cookie;
+ GError *error = NULL;
+ DBusGProxy *proxy = NULL;
+ DBusGConnection *session_connection = NULL;
+
+ /* get the DBUS session connection */
+ session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if (error != NULL) {
+ g_warning ("DBUS cannot connect : %s", error->message);
+ g_error_free (error);
+ return -1;
+ }
+
+ /* get the proxy with gnome-screensaver */
+ proxy = dbus_g_proxy_new_for_name (session_connection,
+ GSS_DBUS_SERVICE,
+ GSS_DBUS_PATH,
+ GSS_DBUS_INTERFACE);
+ if (proxy == NULL) {
+ g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
+ return -1;
+ }
+
+ res = dbus_g_proxy_call (proxy,
+ "Inhibit", &error,
+ G_TYPE_STRING, appname,
+ G_TYPE_STRING, reason,
+ G_TYPE_INVALID,
+ G_TYPE_UINT, &cookie,
+ G_TYPE_INVALID);
+
+ /* check the return value */
+ if (! res) {
+ cookie = -1;
+ g_warning ("Inhibit method failed");
+ }
+
+ /* check the error value */
+ if (error != NULL) {
+ g_warning ("Inhibit problem : %s", error->message);
+ g_error_free (error);
+ cookie = -1;
+ }
+
+ g_object_unref (G_OBJECT (proxy));
+ return cookie;
+}
+
+static void
+dbus_uninhibit_gss (guint cookie)
+{
+ gboolean res;
+ GError *error = NULL;
+ DBusGProxy *proxy = NULL;
+ DBusGConnection *session_connection = NULL;
+
+ /* cookies have to be positive as unsigned */
+ if (cookie < 0) {
+ g_warning ("Invalid cookie");
+ return;
+ }
+
+ /* get the DBUS session connection */
+ session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if (error) {
+ g_warning ("DBUS cannot connect : %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ /* get the proxy with gnome-screensaver */
+ proxy = dbus_g_proxy_new_for_name (session_connection,
+ GSS_DBUS_SERVICE,
+ GSS_DBUS_PATH,
+ GSS_DBUS_INTERFACE);
+ if (proxy == NULL) {
+ g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
+ return;
+ }
+
+ res = dbus_g_proxy_call (proxy,
+ "UnInhibit",
+ &error,
+ G_TYPE_UINT, cookie,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+
+ /* check the return value */
+ if (! res) {
+ g_warning ("UnInhibit method failed");
+ }
+
+ /* check the error value */
+ if (error != NULL) {
+ g_warning ("Inhibit problem : %s", error->message);
+ g_error_free (error);
+ cookie = -1;
+ }
+ g_object_unref (G_OBJECT (proxy));
+}
+#endif
+
void GtkSalFrame::StartPresentation( BOOL bStart )
{
Display *pDisplay = GDK_DISPLAY_XDISPLAY( getGdkDisplay() );
@@ -1699,6 +1817,9 @@
XSetScreenSaver( pDisplay, 0, nInterval,
bPreferBlanking, bAllowExposures );
}
+#ifdef ENABLE_DBUS
+ m_nGSSCookie = dbus_inhibit_gss(g_get_application_name(), "presentation");
+#endif
}
else
{
@@ -1707,6 +1828,9 @@
nInterval, bPreferBlanking,
bAllowExposures );
m_nSavedScreenSaverTimeout = 0;
+#ifdef ENABLE_DBUS
+ dbus_uninhibit_gss(m_nGSSCookie);
+#endif
}
}
Index: unx/gtk/window/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/vcl/unx/gtk/window/makefile.mk 19 Jun 2006 19:45:54 -0000 1.9
+++ openoffice.org/vcl/unx/gtk/window/makefile.mk 24 Jul 2007 09:16:25 -0000
@@ -59,6 +59,10 @@
.IF "$(ENABLE_GTK)" != ""
PKGCONFIG_MODULES=gtk+-2.0
+.IF "$(ENABLE_DBUS)" != ""
+CDEFS+=-DENABLE_DBUS
+PKGCONFIG_MODULES+= dbus-glib-1
+.ENDIF
.INCLUDE : pkg_config.mk
SLOFILES=\
Index: unx/inc/plugins/gtk/gtkframe.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
retrieving revision 1.27
diff -u -r1.27 gtkframe.hxx
--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx 27 Jun 2007 20:44:49 -0000 1.27
+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx 24 Jul 2007 09:16:38 -0000
@@ -192,6 +192,7 @@
GdkVisibilityState m_nVisibility;
PointerStyle m_ePointerStyle;
int m_nSavedScreenSaverTimeout;
+ guint m_nGSSCookie;
int m_nWorkArea;
bool m_bFullscreen;
bool m_bSingleAltPress;
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.94
diff -u -r1.94 makefile.mk
--- openoffice.org.orig/vcl/util/makefile.mk 5 Jul 2007 08:44:46 -0000 1.94
+++ openoffice.org/vcl/util/makefile.mk 24 Jul 2007 09:17:16 -0000
@@ -351,6 +351,9 @@
# gtk plugin
.IF "$(ENABLE_GTK)" != ""
PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
+.IF "$(ENABLE_DBUS)" != ""
+PKGCONFIG_MODULES+= dbus-glib-1
+.ENDIF
.INCLUDE: pkg_config.mk
LIB4TARGET=$(SLB)$/igtk_plug_
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- .cvsignore 25 Mar 2007 17:44:08 -0000 1.127
+++ .cvsignore 26 Jul 2007 20:16:50 -0000 1.128
@@ -204,3 +204,4 @@
OOF680_m12.tar.bz2
OOF680_m13.tar.bz2
OOF680_m14.tar.bz2
+OOF680_m18.tar.bz2
ooobuild.VBAObjects.patch:
Index: ooobuild.VBAObjects.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/ooobuild.VBAObjects.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ooobuild.VBAObjects.patch 30 Jan 2007 15:03:14 -0000 1.14
+++ ooobuild.VBAObjects.patch 26 Jul 2007 20:16:50 -0000 1.15
@@ -923,14 +923,6 @@
const rtl::OUString msEventType;
const rtl::OUString msPresentation;
const rtl::OUString msMacroName;
-@@ -255,6 +259,7 @@
- SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const rtl::OUString& rClass );
- SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
- SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-+ SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::beans::PropertyValue* pProps, const sal_Int32 nCount );
- SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101#
- SAL_DLLPRIVATE void ImpExportGluePoints( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-
diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/eventimp.cxx 2005-09-09 14:44:06.000000000 +0100
+++ xmloff/source/draw/eventimp.cxx 2006-06-19 12:19:16.000000000 +0100
@@ -1458,523 +1450,6 @@
} while(0);
}
-diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx
---- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx 2006-04-26 15:10:26.000000000 +0100
-+++ xmloff/source/draw/shapeexport2.cxx 2006-06-19 12:19:23.000000000 +0100
-@@ -352,273 +352,302 @@ void XMLShapeExport::ImpExportText( cons
- #define FOUND_EVENTTYPE 0x0080
- #define FOUND_MACRO 0x0100
- #define FOUND_LIBRARY 0x0200
-+#define FOUND_ACTION 0x0400
-
--void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& xShape )
-+void XMLShapeExport::ImpExportEvents( const beans::PropertyValue* pProperties, const sal_Int32 nCount )
- {
-- do
-+ sal_Int32 nFound = 0;
-+ OUString aStrEventType;
-+ presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
-+ presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
-+ presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW;
-+ OUString aStrSoundURL;
-+ sal_Bool bPlayFull = false;
-+ sal_Int32 nVerb = 0;
-+ OUString aStrMacro;
-+ OUString aStrLibrary;
-+ OUString aStrBookmark;
-+ OUString aHyperURL;
-+ sal_Int32 nIndex;
-+ for( nIndex = 0; nIndex < nCount; nIndex++, pProperties++ )
- {
-- uno::Reference< document::XEventsSupplier > xEventsSupplier( xShape, uno::UNO_QUERY );
-- if( !xEventsSupplier.is() )
-- break;
-+ if( ( ( nFound & FOUND_EVENTTYPE ) == 0 ) && pProperties->Name == msEventType )
-+ {
-+ if( pProperties->Value >>= aStrEventType )
-+ nFound |= FOUND_EVENTTYPE;
-+ }
-+ else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && pProperties->Name == msClickAction )
-+ {
-+ if( pProperties->Value >>= eClickAction )
-+ nFound |= FOUND_CLICKACTION;
-+ }
-+ else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperties->Name == msMacroName || pProperties->Name == msScript ) )
-+ {
-+ if( pProperties->Value >>= aStrMacro )
-+ nFound |= FOUND_MACRO;
-+ }
-+ else if( ( ( nFound & FOUND_ACTION ) == 0 ) && ( pProperties->Name == msURL ) )
-+ {
-+ if( pProperties->Value >>= aHyperURL )
-+ nFound |= FOUND_ACTION;
-+ }
-+ else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperties->Name == msLibrary )
-+ {
-+ if( pProperties->Value >>= aStrLibrary )
-+ nFound |= FOUND_LIBRARY;
-+ }
-+ else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperties->Name == msEffect )
-+ {
-+ if( pProperties->Value >>= eEffect )
-+ nFound |= FOUND_EFFECT;
-+ }
-+ else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperties->Name == msBookmark )
-+ {
-+ if( pProperties->Value >>= aStrBookmark )
-+ nFound |= FOUND_BOOKMARK;
-+ }
-+ else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperties->Name == msSpeed )
-+ {
-+ if( pProperties->Value >>= eSpeed )
-+ nFound |= FOUND_SPEED;
-+ }
-+ else if( ( ( nFound & FOUND_SOUNDURL ) == 0 ) && pProperties->Name == msSoundURL )
-+ {
-+ if( pProperties->Value >>= aStrSoundURL )
-+ nFound |= FOUND_SOUNDURL;
-+ }
-+ else if( ( ( nFound & FOUND_PLAYFULL ) == 0 ) && pProperties->Name == msPlayFull )
-+ {
-+ if( pProperties->Value >>= bPlayFull )
-+ nFound |= FOUND_PLAYFULL;
-+ }
-+ else if( ( ( nFound & FOUND_VERB ) == 0 ) && pProperties->Name == msVerb )
-+ {
-+ if( pProperties->Value >>= nVerb )
-+ nFound |= FOUND_VERB;
-+ }
-+ }
-
-- uno::Reference< container::XNameReplace > xEvents( xEventsSupplier->getEvents() );
-- DBG_ASSERT( xEvents.is(), "XEventsSupplier::getEvents() returned NULL" );
-- if( !xEvents.is() )
-- break;
-+ if( ( nFound & FOUND_EVENTTYPE ) == 0 )
-+ return;
-
-- uno::Sequence< beans::PropertyValue > aProperties;
-- if( !xEvents->hasByName( msOnClick ) )
-- break;
-+ if( aStrEventType == msPresentation )
-+ {
-+ if( ( nFound & FOUND_CLICKACTION ) == 0 )
-+ return;
-
-- if( !(xEvents->getByName( msOnClick ) >>= aProperties) )
-- break;
-+ if( eClickAction == presentation::ClickAction_NONE )
-+ return;
-
-- sal_Int32 nFound = 0;
-- const beans::PropertyValue* pProperties = aProperties.getConstArray();
-+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-
-- OUString aStrEventType;
-- presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
-- presentation::AnimationEffect eEffect =
-- presentation::AnimationEffect_NONE;
-- presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW;
-- OUString aStrSoundURL;
-- sal_Bool bPlayFull = false;
-- sal_Int32 nVerb = 0;
-- OUString aStrMacro;
-- OUString aStrLibrary;
-- OUString aStrBookmark;
-+ enum XMLTokenEnum eStrAction;
-
-- const sal_Int32 nCount = aProperties.getLength();
-- sal_Int32 nIndex;
-- for( nIndex = 0; nIndex < nCount; nIndex++, pProperties++ )
-+ switch( eClickAction )
- {
-- if( ( ( nFound & FOUND_EVENTTYPE ) == 0 ) && pProperties->Name == msEventType )
-- {
-- if( pProperties->Value >>= aStrEventType )
-- nFound |= FOUND_EVENTTYPE;
-- }
-- else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && pProperties->Name == msClickAction )
-- {
-- if( pProperties->Value >>= eClickAction )
-- nFound |= FOUND_CLICKACTION;
-- }
-- else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperties->Name == msMacroName || pProperties->Name == msScript ) )
-- {
-- if( pProperties->Value >>= aStrMacro )
-- nFound |= FOUND_MACRO;
-- }
-- else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperties->Name == msLibrary )
-- {
-- if( pProperties->Value >>= aStrLibrary )
-- nFound |= FOUND_LIBRARY;
-- }
-- else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperties->Name == msEffect )
-- {
-- if( pProperties->Value >>= eEffect )
-- nFound |= FOUND_EFFECT;
-- }
-- else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperties->Name == msBookmark )
-- {
-- if( pProperties->Value >>= aStrBookmark )
-- nFound |= FOUND_BOOKMARK;
-- }
-- else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperties->Name == msSpeed )
-- {
-- if( pProperties->Value >>= eSpeed )
-- nFound |= FOUND_SPEED;
-- }
-- else if( ( ( nFound & FOUND_SOUNDURL ) == 0 ) && pProperties->Name == msSoundURL )
-- {
-- if( pProperties->Value >>= aStrSoundURL )
-- nFound |= FOUND_SOUNDURL;
-- }
-- else if( ( ( nFound & FOUND_PLAYFULL ) == 0 ) && pProperties->Name == msPlayFull )
-- {
-- if( pProperties->Value >>= bPlayFull )
-- nFound |= FOUND_PLAYFULL;
-- }
-- else if( ( ( nFound & FOUND_VERB ) == 0 ) && pProperties->Name == msVerb )
-- {
-- if( pProperties->Value >>= nVerb )
-- nFound |= FOUND_VERB;
-- }
-+ case presentation::ClickAction_PREVPAGE: eStrAction = XML_PREVIOUS_PAGE; break;
-+ case presentation::ClickAction_NEXTPAGE: eStrAction = XML_NEXT_PAGE; break;
-+ case presentation::ClickAction_FIRSTPAGE: eStrAction = XML_FIRST_PAGE; break;
-+ case presentation::ClickAction_LASTPAGE: eStrAction = XML_LAST_PAGE; break;
-+ case presentation::ClickAction_INVISIBLE: eStrAction = XML_HIDE; break;
-+ case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break;
-+ case presentation::ClickAction_PROGRAM: eStrAction = XML_EXECUTE; break;
-+ case presentation::ClickAction_BOOKMARK: eStrAction = XML_SHOW; break;
-+ case presentation::ClickAction_DOCUMENT: eStrAction = XML_SHOW; break;
-+ case presentation::ClickAction_MACRO: eStrAction = XML_EXECUTE_MACRO; break;
-+ case presentation::ClickAction_VERB: eStrAction = XML_VERB; break;
-+ case presentation::ClickAction_VANISH: eStrAction = XML_FADE_OUT; break;
-+ case presentation::ClickAction_SOUND: eStrAction = XML_SOUND; break;
-+ default:
-+ DBG_ERROR( "unknown presentation::ClickAction found!" );
-+ eStrAction = XML_UNKNOWN;
- }
-
-- if( ( nFound & FOUND_EVENTTYPE ) == 0 )
-- break;
-+ OUString aEventQName(
-+ mrExport.GetNamespaceMap().GetQNameByKey(
-+ XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+ mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
-
-- if( aStrEventType == msPresentation )
-+ if( eClickAction == presentation::ClickAction_VANISH )
- {
-- if( ( nFound & FOUND_CLICKACTION ) == 0 )
-- break;
-+ if( nFound & FOUND_EFFECT )
-+ {
-+ XMLEffect eKind;
-+ XMLEffectDirection eDirection;
-+ sal_Int16 nStartScale;
-+ sal_Bool bIn;
-
-- if( eClickAction == presentation::ClickAction_NONE )
-- break;
-+ SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
-
-- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-+ if( eKind != EK_none )
-+ {
-+ SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
-+ }
-
-- enum XMLTokenEnum eStrAction;
-+ if( eDirection != ED_none )
-+ {
-+ SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap );
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() );
-+ }
-
-- switch( eClickAction )
-- {
-- case presentation::ClickAction_PREVPAGE: eStrAction = XML_PREVIOUS_PAGE; break;
-- case presentation::ClickAction_NEXTPAGE: eStrAction = XML_NEXT_PAGE; break;
-- case presentation::ClickAction_FIRSTPAGE: eStrAction = XML_FIRST_PAGE; break;
-- case presentation::ClickAction_LASTPAGE: eStrAction = XML_LAST_PAGE; break;
-- case presentation::ClickAction_INVISIBLE: eStrAction = XML_HIDE; break;
-- case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break;
-- case presentation::ClickAction_PROGRAM: eStrAction = XML_EXECUTE; break;
-- case presentation::ClickAction_BOOKMARK: eStrAction = XML_SHOW; break;
-- case presentation::ClickAction_DOCUMENT: eStrAction = XML_SHOW; break;
-- case presentation::ClickAction_MACRO: eStrAction = XML_EXECUTE_MACRO; break;
-- case presentation::ClickAction_VERB: eStrAction = XML_VERB; break;
-- case presentation::ClickAction_VANISH: eStrAction = XML_FADE_OUT; break;
-- case presentation::ClickAction_SOUND: eStrAction = XML_SOUND; break;
-- default:
-- DBG_ERROR( "unknown presentation::ClickAction found!" );
-- eStrAction = XML_UNKNOWN;
-+ if( nStartScale != -1 )
-+ {
-+ SvXMLUnitConverter::convertPercent( msBuffer, nStartScale );
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() );
-+ }
- }
-
-- OUString aEventQName(
-- mrExport.GetNamespaceMap().GetQNameByKey(
-- XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
--
-- if( eClickAction == presentation::ClickAction_VANISH )
-+ if( nFound & FOUND_SPEED && eEffect != presentation::AnimationEffect_NONE )
- {
-- if( nFound & FOUND_EFFECT )
-+ if( eSpeed != presentation::AnimationSpeed_MEDIUM )
- {
-- XMLEffect eKind;
-- XMLEffectDirection eDirection;
-- sal_Int16 nStartScale;
-- sal_Bool bIn;
--
-- SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
-+ SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap );
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() );
-+ }
-+ }
-+ }
-
-- if( eKind != EK_none )
-- {
-- SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
-- }
-+ if( eClickAction == presentation::ClickAction_PROGRAM ||
-+ eClickAction == presentation::ClickAction_BOOKMARK ||
-+ eClickAction == presentation::ClickAction_DOCUMENT )
-+ {
-+ if( eClickAction == presentation::ClickAction_BOOKMARK )
-+ msBuffer.append( sal_Unicode('#') );
-
-- if( eDirection != ED_none )
-- {
-- SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap );
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() );
-- }
-+ msBuffer.append( aStrBookmark );
-+ mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) );
-+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
-+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
-+ }
-
-- if( nStartScale != -1 )
-- {
-- SvXMLUnitConverter::convertPercent( msBuffer, nStartScale );
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() );
-- }
-- }
-+ if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB )
-+ {
-+ msBuffer.append( nVerb );
-+ mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
-+ }
-
-- if( nFound & FOUND_SPEED && eEffect != presentation::AnimationEffect_NONE )
-- {
-- if( eSpeed != presentation::AnimationSpeed_MEDIUM )
-- {
-- SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap );
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() );
-- }
-- }
-- }
-+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
-
-- if( eClickAction == presentation::ClickAction_PROGRAM ||
-- eClickAction == presentation::ClickAction_BOOKMARK ||
-- eClickAction == presentation::ClickAction_DOCUMENT )
-+ if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
-+ {
-+ if( ( nFound & FOUND_SOUNDURL ) && aStrSoundURL.getLength() != 0 )
- {
-- if( eClickAction == presentation::ClickAction_BOOKMARK )
-- msBuffer.append( sal_Unicode('#') );
--
-- msBuffer.append( aStrBookmark );
-- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) );
-+ mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) );
- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
-- }
-+ if( nFound & FOUND_PLAYFULL && bPlayFull )
-+ mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
-
-- if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB )
-- {
-- msBuffer.append( nVerb );
-- mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
-+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
- }
-+ }
-+ }
-+ else if( aStrEventType == msStarBasic )
-+ {
-+ if( nFound & FOUND_MACRO )
-+ {
-+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-
-- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
-+ mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
-+ mrExport.GetNamespaceMap().GetQNameByKey(
-+ XML_NAMESPACE_OOO,
-+ OUString( RTL_CONSTASCII_USTRINGPARAM(
-+ "starbasic" ) ) ) );
-+ OUString aEventQName(
-+ mrExport.GetNamespaceMap().GetQNameByKey(
-+ XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+ mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-
-- if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
-+ if( nFound & FOUND_LIBRARY )
- {
-- if( ( nFound & FOUND_SOUNDURL ) && aStrSoundURL.getLength() != 0 )
-- {
-- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) );
-- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
-- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
-- if( nFound & FOUND_PLAYFULL && bPlayFull )
-- mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
--
-- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
-- }
-+ OUString sLocation( GetXMLToken(
-+ (aStrLibrary.equalsIgnoreAsciiCaseAscii("StarOffice") ||
-+ aStrLibrary.equalsIgnoreAsciiCaseAscii("application") ) ? XML_APPLICATION
-+ : XML_DOCUMENT ) );
-+ OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 );
-+ sTmp = sLocation;
-+ sTmp.append( sal_Unicode( ':' ) );
-+ sTmp.append( aStrMacro );
-+ mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
-+ sTmp.makeStringAndClear());
- }
-- break;
-+ else
-+ {
-+ mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
-+ }
-+
-+
-+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
- }
-- else if( aStrEventType == msStarBasic )
-+ }
-+ else if( aStrEventType == msScript || aStrEventType == msAction )
-+ {
-+ if( nFound & ( FOUND_MACRO | FOUND_ACTION ) )
- {
-- if( nFound & FOUND_MACRO )
-+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-+ if ( nFound & FOUND_MACRO )
- {
-- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
--
-- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
-- mrExport.GetNamespaceMap().GetQNameByKey(
-- XML_NAMESPACE_OOO,
-- OUString( RTL_CONSTASCII_USTRINGPARAM(
-- "starbasic" ) ) ) );
-+ mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
-+ XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
- OUString aEventQName(
- mrExport.GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
--
-- if( nFound & FOUND_LIBRARY )
-- {
-- OUString sLocation( GetXMLToken(
-- (aStrLibrary.equalsIgnoreAsciiCaseAscii("StarOffice") ||
-- aStrLibrary.equalsIgnoreAsciiCaseAscii("application") ) ? XML_APPLICATION
-- : XML_DOCUMENT ) );
-- OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 );
-- sTmp = sLocation;
-- sTmp.append( sal_Unicode( ':' ) );
-- sTmp.append( aStrMacro );
-- mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
-- sTmp.makeStringAndClear());
-- }
-- else
-- {
-- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
-- }
--
-+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
-
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
- }
-- }
-- else if( aStrEventType == msScript )
-- {
-- if( nFound & FOUND_MACRO )
-+ if ( nFound & FOUND_ACTION )
- {
-- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
--
- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
-- XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
-+ XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
- OUString aEventQName(
- mrExport.GetNamespaceMap().GetQNameByKey(
-- XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+ XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
-+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
-
-- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
-+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_DRAW, XML_EVENT_LISTENER, sal_True, sal_True);
- }
- }
- }
-+}
-+
-+void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& xShape )
-+{
-+ do
-+ {
-+ uno::Reference< document::XEventsSupplier > xEventsSupplier( xShape, uno::UNO_QUERY );
-+ if( !xEventsSupplier.is() )
-+ break;
-+
-+ uno::Reference< container::XNameReplace > xEvents( xEventsSupplier->getEvents() );
-+ DBG_ASSERT( xEvents.is(), "XEventsSupplier::getEvents() returned NULL" );
-+ if( !xEvents.is() )
-+ break;
-+
-+ static uno::Sequence< OUString > aEvents = xEvents->getElementNames();
-+ const OUString* pEvt = aEvents.getConstArray();
-+ const OUString* pEnd = aEvents.getConstArray() + aEvents.getLength();
-+
-+ for ( ; pEvt != pEnd; ++pEvt )
-+ {
-+ uno::Sequence< beans::PropertyValue > aProperties;
-+ if( !xEvents->hasByName( *pEvt ) )
-+ break;
-+
-+ if( !(xEvents->getByName( *pEvt ) >>= aProperties) )
-+ break;
-+ const beans::PropertyValue* pProperties = aProperties.getConstArray();
-+ const sal_Int32 nCount = aProperties.getLength();
-+ ImpExportEvents( pProperties, nCount );
-+ }
-+
-+ }
- while(0);
- }
-
diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport.cxx xmloff/source/draw/shapeexport.cxx
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport.cxx 2006-03-27 11:04:25.000000000 +0100
+++ xmloff/source/draw/shapeexport.cxx 2006-06-19 12:18:00.000000000 +0100
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 4 Nov 2006 12:11:28 -0000 1.18
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 26 Jul 2007 20:16:50 -0000 1.19
@@ -114,128 +114,6 @@
#ifdef WNT
aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-Index: source/services/substitutepathvars.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
-retrieving revision 1.10
-diff -u -p -r1.10 substitutepathvars.cxx
---- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 13 Jan 2005 19:14:36 -0000 1.10
-+++ openoffice.org/framework/source/services/substitutepathvars.cxx 29 Jun 2005 10:45:59 -0000
-@@ -125,6 +125,14 @@
- #include <rtl/ustrbuf.hxx>
- #endif
-
-+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#endif
-+
-+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
-+#include <comphelper/processfactory.hxx>
-+#endif
-+
- //_________________________________________________________________________________________________________________
- // Defines
- //_________________________________________________________________________________________________________________
-@@ -1190,6 +1198,88 @@
- return rtl::OUString();
- }
-
-+using rtl::OUString;
-+using rtl::OString;
-+
-+Reference< XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
-+{
-+ Reference< XNameAccess > xNameAccess;
-+ try{
-+ OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-+ OUString sAccessSrvc;
-+ if (bUpdate)
-+ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
-+ else
-+ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
-+
-+ OUString sConfigURL = OUString::createFromAscii(pPath);
-+
-+ // get configuration provider
-+ Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
-+ if (theMSF.is()) {
-+ Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory > (
-+ theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW );
-+
-+ // access the provider
-+ Sequence< Any > theArgs(1);
-+ theArgs[ 0 ] <<= sConfigURL;
-+ xNameAccess = Reference< XNameAccess > (
-+ theConfigProvider->createInstanceWithArguments(
-+ sAccessSrvc, theArgs ), UNO_QUERY_THROW );
-+ }
-+ } catch (com::sun::star::uno::Exception& e)
-+ {
-+ OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-+ OSL_ENSURE(sal_False, aMsg.getStr());
-+ }
-+ return xNameAccess;
-+}
-+
-+void getInstallMapping(OUString& usLocale)
-+{
-+ Sequence< OUString > seqLanguages;
-+ Reference< XNameAccess > xAccess =
-+ getConfigAccess(
-+ "org.openoffice.Setup/Office/InstalledLocales", sal_False);
-+ if (xAccess.is())
-+ seqLanguages = xAccess->getElementNames();
-+
-+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
-+ {
-+ if (usLocale.equals(seqLanguages[i]))
-+ return;
-+ }
-+
-+ // try fallback locales
-+ if (usLocale.equalsAscii("zh-HK"))
-+ {
-+ OUString sTemp = OUString::createFromAscii("zh-TW");
-+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
-+ {
-+ if (sTemp.equals(seqLanguages[i]))
-+ {
-+ usLocale = sTemp;
-+ return;
-+ }
-+ }
-+ }
-+
-+ // no exact match was found, well try to find a substitute
-+ OUString aInstalledLocale;
-+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
-+ {
-+ if (usLocale.indexOf(seqLanguages[i]) == 0)
-+ {
-+ // requested locale starts with the installed locale
-+ // (i.e. installed locale has index 0 in requested locale)
-+ usLocale = seqLanguages[i];
-+ return;
-+ break;
-+ }
-+ }
-+ usLocale = OUString::createFromAscii("en-US");
-+}
-+
- void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
- {
- utl::ConfigManager* pCfgMgr = utl::ConfigManager::GetConfigManager();
-@@ -1253,7 +1343,10 @@
- Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
- rtl::OUString aLocaleStr;
- if ( aLocale >>= aLocaleStr )
-+ {
-+ getInstallMapping(aLocaleStr);
- aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr );
-+ }
- else
- {
- LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Wrong Any type for language!" );
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
@@ -782,3 +660,184 @@
next; # removing this file from list, if sourcepath is empty
}
+Index: inc/unotools/localedatawrapper.hxx
+===================================================================
+RCS file: /cvs/util/unotools/inc/unotools/localedatawrapper.hxx,v
+retrieving revision 1.28.38.1
+diff -u -r1.28.38.1 localedatawrapper.hxx
+--- openoffice.org.orig/unotools/inc/unotools/localedatawrapper.hxx 19 Jan 2007 15:29:43 -0000 1.28.38.1
++++ openoffice.org/unotools/inc/unotools/localedatawrapper.hxx 28 Jun 2007 13:55:45 -0000
+@@ -363,5 +363,7 @@
+ static void evaluateLocaleDataChecking();
+ };
+
++UNOTOOLS_DLLPUBLIC void getInstallMapping(rtl::OUString& usLocale);
++
+
+ #endif // _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+Index: source/i18n/localedatawrapper.cxx
+===================================================================
+RCS file: /cvs/util/unotools/source/i18n/localedatawrapper.cxx,v
+retrieving revision 1.36.16.1
+diff -u -r1.36.16.1 localedatawrapper.cxx
+--- openoffice.org.orig/unotools/source/i18n/localedatawrapper.cxx 19 Jan 2007 15:30:09 -0000 1.36.16.1
++++ openoffice.org/unotools/source/i18n/localedatawrapper.cxx 28 Jun 2007 13:55:46 -0000
+@@ -1989,3 +1989,96 @@
+ else
+ OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+ }
++
++#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
++#include <com/sun/star/container/XNameAccess.hpp>
++#endif
++
++#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
++#include <comphelper/processfactory.hxx>
++#endif
++
++using rtl::OUString;
++using rtl::OString;
++using namespace com::sun::star::uno;
++using namespace com::sun::star::container;
++using namespace com::sun::star::lang;
++
++Reference< XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
++{
++ Reference< XNameAccess > xNameAccess;
++ try{
++ OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
++ OUString sAccessSrvc;
++ if (bUpdate)
++ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
++ else
++ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
++
++ OUString sConfigURL = OUString::createFromAscii(pPath);
++
++ // get configuration provider
++ Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
++ if (theMSF.is()) {
++ Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory > (
++ theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW );
++
++ // access the provider
++ Sequence< Any > theArgs(1);
++ theArgs[ 0 ] <<= sConfigURL;
++ xNameAccess = Reference< XNameAccess > (
++ theConfigProvider->createInstanceWithArguments(
++ sAccessSrvc, theArgs ), UNO_QUERY_THROW );
++ }
++ } catch (com::sun::star::uno::Exception& e)
++ {
++ OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
++ OSL_ENSURE(sal_False, aMsg.getStr());
++ }
++ return xNameAccess;
++}
++
++void getInstallMapping(OUString& usLocale)
++{
++ Sequence< OUString > seqLanguages;
++ Reference< XNameAccess > xAccess =
++ getConfigAccess(
++ "org.openoffice.Setup/Office/InstalledLocales", sal_False);
++ if (xAccess.is())
++ seqLanguages = xAccess->getElementNames();
++
++ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
++ {
++ if (usLocale.equals(seqLanguages[i]))
++ return;
++ }
++
++ // try fallback locales
++ if (usLocale.equalsAscii("zh-HK"))
++ {
++ OUString sTemp = OUString::createFromAscii("zh-TW");
++ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
++ {
++ if (sTemp.equals(seqLanguages[i]))
++ {
++ usLocale = sTemp;
++ return;
++ }
++ }
++ }
++
++ // no exact match was found, well try to find a substitute
++ OUString aInstalledLocale;
++ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
++ {
++ if (usLocale.indexOf(seqLanguages[i]) == 0)
++ {
++ // requested locale starts with the installed locale
++ // (i.e. installed locale has index 0 in requested locale)
++ usLocale = seqLanguages[i];
++ return;
++ break;
++ }
++ }
++ usLocale = OUString::createFromAscii("en-US");
++}
+Index: source/services/substitutepathvars.cxx
+===================================================================
+RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
+retrieving revision 1.17
+diff -u -r1.17 substitutepathvars.cxx
+--- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 16 Sep 2006 14:12:15 -0000 1.17
++++ openoffice.org/framework/source/services/substitutepathvars.cxx 28 Jun 2007 13:59:22 -0000
+@@ -129,7 +129,7 @@
+ #endif
+
+ #include <comphelper/configurationhelper.hxx>
+-
++#include <unotools/localedatawrapper.hxx>
+ //_________________________________________________________________________________________________________________
+ // Defines
+ //_________________________________________________________________________________________________________________
+@@ -1264,7 +1264,10 @@
+ Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
+ rtl::OUString aLocaleStr;
+ if ( aLocale >>= aLocaleStr )
++ {
++ getInstallMapping(aLocaleStr);
+ aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr );
++ }
+ else
+ {
+ LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Wrong Any type for language!" );
+Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.35.34.1
+diff -u -r1.35.34.1 salnativewidgets-gtk.cxx
+--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 24 Jan 2007 13:35:35 -0000 1.35.34.1
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 28 Jun 2007 14:02:41 -0000
+@@ -57,6 +57,7 @@
+ #include <saldisp.hxx>
+ #endif
+
++#include <unotools/localedatawrapper.hxx>
+
+ // initialize statics
+ BOOL GtkSalGraphics::bThemeChanged = TRUE;
+@@ -3103,7 +3104,18 @@
+ #endif
+
+ // match font to e.g. resolve "Sans"
+- psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
++ com::sun::star::lang::Locale aLocale = rSettings.GetUILocale();
++ rtl::OUString sUILocale(aLocale.Language);
++ if (aLocale.Country.getLength())
++ sUILocale = sUILocale + '-' + aLocale.Country;
++ getInstallMapping(sUILocale);
++ sal_Int32 nIndex = 0;
++ aLocale.Language = sUILocale.getToken( 0, sal_Unicode('-'), nIndex );
++ if( nIndex != -1 )
++ aLocale.Country = sUILocale.getToken( 0, sal_Unicode('-'), nIndex );
++ else
++ aLocale.Country = OUString();
++ psp::PrintFontManager::get().matchFont( aInfo, aLocale );
+
+ #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 28 Nov 2006 17:35:13 -0000 1.13
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 26 Jul 2007 20:16:50 -0000 1.14
@@ -488,3 +488,80 @@
throw;
}
}
+Index: source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 22 Nov 2006 11:07:20 -0000 1.12
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 5 Jun 2007 12:38:03 -0000
+@@ -512,7 +512,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- void ** slots, unsigned char * code,
++ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 /* functionCount */, sal_Int32 vTableOffset)
+ {
+@@ -523,7 +523,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vTableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -535,13 +535,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vTableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vTableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:55:15.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:56:12.000000000 +0100
+@@ -674,7 +674,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- void ** slots, unsigned char * code,
++ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -690,7 +690,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -703,13 +703,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vtableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 4 May 2007 14:23:08 -0000 1.31
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 26 Jul 2007 20:16:50 -0000 1.32
@@ -1,3 +1,72 @@
+Index: inc/psprint/jobdata.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/jobdata.hxx,v
+retrieving revision 1.4
+diff -u -r1.4 jobdata.hxx
+--- openoffice.org.orig/psprint/inc/psprint/jobdata.hxx 4 Dec 2006 16:33:06 -0000 1.4
++++ openoffice.org/psprint/inc/psprint/jobdata.hxx 9 May 2007 10:45:05 -0000
+@@ -51,6 +51,7 @@
+
+ struct JobData
+ {
++ bool m_bCupsJob;
+ int m_nCopies;
+ int m_nLeftMarginAdjust;
+ int m_nRightMarginAdjust;
+@@ -66,6 +67,7 @@
+ PPDContext m_aContext;
+
+ JobData() :
++ m_bCupsJob( false ),
+ m_nCopies( 1 ),
+ m_nLeftMarginAdjust( 0 ),
+ m_nRightMarginAdjust( 0 ),
+Index: source/printer/jobdata.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/printer/jobdata.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 jobdata.cxx
+--- openoffice.org.orig/psprint/source/printer/jobdata.cxx 4 Dec 2006 16:33:20 -0000 1.9
++++ openoffice.org/psprint/source/printer/jobdata.cxx 9 May 2007 10:45:55 -0000
+@@ -46,6 +46,7 @@
+
+ JobData& JobData::operator=(const JobData& rRight)
+ {
++ m_bCupsJob = rRight.m_bCupsJob;
+ m_nCopies = rRight.m_nCopies;
+ m_nLeftMarginAdjust = rRight.m_nLeftMarginAdjust;
+ m_nRightMarginAdjust = rRight.m_nRightMarginAdjust;
+@@ -94,6 +95,10 @@
+ aLine += ByteString::CreateFromInt32( m_nCopies );
+ aStream.WriteLine( aLine );
+
++ aLine = "cups=";
++ aLine += ByteString::CreateFromInt32( m_bCupsJob );
++ aStream.WriteLine( aLine );
++
+ aLine = "margindajustment=";
+ aLine += ByteString::CreateFromInt32( m_nLeftMarginAdjust );
+ aLine += ',';
+@@ -136,6 +141,7 @@
+ bool bVersion = false;
+ bool bPrinter = false;
+ bool bOrientation = false;
++ bool bCups = false;
+ bool bCopies = false;
+ bool bContext = false;
+ bool bMargin = false;
+@@ -162,6 +168,11 @@
+ bCopies = true;
+ rJobData.m_nCopies = aLine.Copy( 7 ).ToInt32();
+ }
++ else if( aLine.CompareTo( "cups=", 5 ) == COMPARE_EQUAL )
++ {
++ bCups = true;
++ rJobData.m_bCupsJob = aLine.Copy( 5 ).ToInt32();
++ }
+ else if( aLine.CompareTo( "margindajustment=",17 ) == COMPARE_EQUAL )
+ {
+ bMargin = true;
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
@@ -5,16 +74,15 @@
diff -u -r1.40 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000
-@@ -740,6 +740,9 @@
- if( ! pKey || ! pValue )
- return true;
-
-+ if (pValue->m_bCupsOnly)
-+ return true;
-+
- OStringBuffer aFeature(256);
- aFeature.append( "[{\n" );
- if( bUseIncluseFeature )
+@@ -1150,7 +1154,7 @@
+ WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+ }
+
+- bool bFeatureSuccess = writeFeatureList( pFile, rJob, true );
++ bool bFeatureSuccess = !rJob.m_bCupsJob ? writeFeatureList( pFile, rJob, true ) : true;
+
+ WritePS (pFile, "%%EndSetup\n");
+
Index: inc/psprint/ppdparser.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
@@ -22,12 +90,11 @@
diff -u -r1.9 ppdparser.hxx
--- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 8 Sep 2005 16:34:44 -0000 1.9
+++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 19 May 2006 13:15:15 -0000
-@@ -61,6 +61,8 @@
+@@ -61,6 +61,7 @@
String m_aOptionTranslation;
String m_aValue;
String m_aValueTranslation;
-+ bool m_bCupsOnly;
-+ PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {}
++ PPDValue() : m_eType(eInvocation) {}
};
// ----------------------------------------------------------------------
@@ -144,7 +211,7 @@
// =======================================================================
DBG_NAME( JobSetup )
-@@ -244,6 +245,199 @@
+@@ -244,6 +245,198 @@
mpData = new ImplJobSetup();
mpData->maValueMap[ rKey ] = rValue;
@@ -332,13 +399,12 @@
+ PPDKey* pNewKey = new PPDKey( rKey );
+ PPDValue* pValue = pNewKey->insertValue(rValue);
+ pValue->m_eType = eInvocation;
-+ pValue->m_bCupsOnly = true;
+ pValue->m_aValue = rValue;
+ const_cast<PPDParser*>(aInfo.m_pParser)->insertKey( rKey, pNewKey );
+ aInfo.m_aContext.setValue(pNewKey, pValue);
+ }
+ }
-+
++ aInfo.m_bCupsJob=true;
+ copyJobDataToJobSetup( mpData, aInfo );
+
}
@@ -557,7 +623,7 @@
{
FreeResource();
-@@ -608,6 +656,246 @@
+@@ -608,6 +656,250 @@
// -----------------------------------------------------------------------
@@ -575,9 +641,13 @@
+ pPrinter->SetJobCupsKey( String::CreateFromAscii(key+5), String::CreateFromAscii(value));
+ else if ((!strcmp(key, "reverse")) && (!strcmp(value, "true")))
+ pPrinter->SetJobCupsKey(String::CreateFromAscii("OutputOrder"), String::CreateFromAscii("Reverse"));
++ else if ((!strcmp(key, "collate")) && (!strcmp(value, "true")))
++ pPrinter->SetJobCupsKey(String::CreateFromAscii("Collate"), String::CreateFromAscii("True"));
++ else if (!strcmp(key, "n-copies"))
++ pPrinter->SetJobCupsKey(String::CreateFromAscii("Copies"), String::CreateFromAscii(value));
+}
+
-+void ExportAsPDF(const rtl::OUString &rFileURL, sal_Bool, sal_uInt32, PrintDialogRange eRange, const OUString &rRange)
++void ExportAsPDF(const rtl::OUString &rFileURL, PrintDialogRange eRange, const OUString &rRange)
+{
+ Reference < XFramesSupplier > xDesktop =
+ Reference < XFramesSupplier >(
@@ -804,7 +874,7 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,308 @@
+@@ -625,15 +908,309 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
@@ -1007,10 +1077,11 @@
+ else
+ meCheckRange = PRINTDIALOG_ALL;
+
-+ SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
-+ BOOL bGtkCollate = gtk_print_settings_get_collate(pSettings);
-+ EnableCollate(bGtkCollate);
-+ CheckCollate(bGtkCollate);
++ //Tell OOo to only print 1 simple copy, we'll stick everything
++ //else through cups
++ SetCopyCount(1);
++ EnableCollate(false);
++ CheckCollate(false);
+
+ pStr = 0;
+
@@ -1022,7 +1093,7 @@
+ gtk_widget_hide( aHandle.pDialog );
+ rtl::OUString sFileURL;
+ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
-+ ExportAsPDF(sFileURL, IsCollateEnabled(), GetCopyCount(), meCheckRange, maRangeText);
++ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
+ }
+ else
+ {
openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch:
Index: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch 26 Jul 2007 09:09:26 -0000 1.5
+++ openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch 26 Jul 2007 20:16:50 -0000 1.6
@@ -6385,3 +6385,40 @@
-.ENDIF
-
+ HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+diff -ru config_office.orig/configure.in config_office/configure.in
+--- openoffice.org.orig/config_office/configure.in 2007-06-05 15:55:39.000000000 +0100
++++ openoffice.org/config_office/configure.in 2007-06-05 15:56:50.000000000 +0100
+@@ -3031,33 +3031,6 @@
+ # [AC_MSG_ERROR([db library not installed or functional])], [])
+ AC_HAVE_LIBRARY(db, [],
+ [AC_MSG_ERROR([db not installed or functional])], [])
+- if test "$SOLAR_JAVA" = "TRUE"; then
+- if test -z "$DB_JAR"; then
+- # three different naming methods *grumble* Are there even more?
+- AC_CHECK_FILE(/usr/share/java/db.jar, [ JARVER=0 ],
+- [
+- AC_CHECK_FILE(/usr/share/java/db-$DB_VERSION.jar, [ JARVER=1 ],
+- [ AC_CHECK_FILE(/usr/share/java/libdb$DB_VERSION-java.jar,
+- [ JARVER_LONGSTYLE=1 ],
+- [ AC_MSG_ERROR(db$DB_VERSION_MAJOR Java bindings not found)]
+- )
+- ]
+- )
+- ]
+- )
+- if test "$JARVER" = "1"; then
+- DB_JAR=/usr/share/java/jar-$DB_VERSION.jar
+- else
+- DB_JAR=/usr/share/java/db.jar
+- fi
+- if test "$JARVER_LONGSTYLE" = "1"; then
+- DB_JAR=/usr/share/java/libdb$DB_VERSION-java.jar
+- fi
+- if test -z "$DB_JAR"; then
+- AC_MSG_ERROR([libdb $DB_VERSION jar not found. Install it or specify path with --with-db-jar=/path/to/jar])
+- fi
+- fi
+- fi
+ SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+ AC_MSG_RESULT([internal])
openoffice.org-2.2.0.ooo53397.linkopt.patch:
Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-2.2.0.ooo53397.linkopt.patch 27 Apr 2007 08:27:47 -0000 1.11
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch 26 Jul 2007 20:16:50 -0000 1.12
@@ -2417,7 +2417,7 @@
diff -u -r1.13.34.1 makefile.mk
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk 1 Feb 2007 19:08:29 -0000 1.13.34.1
+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk 27 Mar 2007 10:45:27 -0000
-@@ -97,17 +97,11 @@
+@@ -97,16 +97,10 @@
SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
SHL1STDLIBS= \
@@ -2433,8 +2433,7 @@
$(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
- $(HUNSPELLLIB)
+ $(LNGLIB)
Index: source/thesaurus/libnth/makefile.mk
===================================================================
Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-simple-crash_report.sh 26 Feb 2007 15:33:12 -0000 1.3
+++ openoffice.org-simple-crash_report.sh 26 Jul 2007 20:16:50 -0000 1.4
@@ -5,15 +5,16 @@
filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
echo "(I) x.org loaded video driver of..." > $filename
-grep drivers `(xset -q || echo " Log file: /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-` >> $filename
+xlog=`(xset -q || echo " Log file: /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-`
+grep "drivers" $xlog >> $filename
+grep "pixmap format" $xlog >> $filename
echo "(III) Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
echo "(IV) libgcj version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH} ' libgcj` >> $filename
echo "(V) kernel is:" `uname -s -r -v -m -p -i` >> $filename
echo "(VI) OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
-echo "(VII) `xdpyinfo | grep "depth of root window:"`" >> $filename
-echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
+echo "(VII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
if [ -e /etc/fedora-release ]; then
-echo "(VIV) fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(VIII) fedora release is:" `cat /etc/fedora-release` >> $filename
fi
echo "...start free space details ..." >> $filename
df -k /home /tmp >> $filename
@@ -33,7 +34,7 @@
echo "...end stackreport details ..." >> $filename
echo "...start sample ldd details ..." >> $filename
-ldd /usr/lib*/openoffice.org/program/libreg.so.3 >> $filename
+ldd /usr/lib*/openoffice.org/program/libvclplug_gtk*.so >> $filename
echo "...end sample ldd details ..." >> $filename
echo
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1188
retrieving revision 1.1189
diff -u -r1.1188 -r1.1189
--- openoffice.org.spec 11 Jul 2007 13:31:30 -0000 1.1188
+++ openoffice.org.spec 26 Jul 2007 20:16:50 -0000 1.1189
@@ -1,17 +1,16 @@
%define oootag OOF680
-%define ooomilestone 14
-%define rh_rpm_release 12
+%define ooomilestone 18
+%define rh_rpm_release 1
-# gcc#19664#
-%define stlvisibilityfcked 1
-# undef to get english only and no-langpacks for a quick smoketest build
+# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
# undef to revert to the traditional print dialog
%define gtkprintui 1
-# undef to revert from combining startup libs into a single libsoffice
+# undef to refrain from combining startup libs into a single libsoffice
%define linkopt 0
+%define stlport_abi_lockin 1
-%if %{stlvisibilityfcked}
+%if %{stlport_abi_lockin}
%define stlflags --with-stlport4
%else
%define stlflags --without-stlport4
@@ -28,8 +27,8 @@
ExcludeArch: ppc64
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.2.0
-Release: %{ooomilestone}.%{rh_rpm_release}
+Version: 2.2.1
+Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPL
Group: Applications/Productivity
@@ -42,15 +41,15 @@
Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-BuildRequires: tcsh, zip, findutils, prelink autoconf, flex, bison, ant, icu
+BuildRequires: tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
BuildRequires: perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires: libgcj-devel, java-devel, zlib-devel, xerces-j2
+BuildRequires: gdb, libgcj-devel, java-devel, zlib-devel, xerces-j2, prelink
BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
BuildRequires: curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
BuildRequires: libxml2-devel, neon-devel, libidn-devel, pam-devel, hsqldb
BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires: libxslt-devel, db4-devel, db4-java, firefox-devel, libwpd-devel
+BuildRequires: libxslt-devel, db4-devel, firefox-devel, libwpd-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
BuildRequires: perl-Archive-Zip
@@ -67,7 +66,7 @@
Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
Patch12: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch13: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch13: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
Patch14: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
%if %{gtkprintui}
Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
@@ -75,66 +74,66 @@
Patch16: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
Patch17: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch18: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch19: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch20: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch21: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch22: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch23: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch24: workspace.libxslt02.patch
-Patch25: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch26: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch27: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch28: workspace.fpicker6.patch
-Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch30: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch31: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch32: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch33: ooobuild.VBAObjects.patch
-Patch34: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch35: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch36: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch37: pseudoworkspace.valgrind1.patch
-Patch38: workspace.thbpp6.patch
-Patch39: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch40: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch41: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch42: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch43: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch44: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch45: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch46: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch47: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch48: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch49: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch50: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch51: workspace.tl37.patch
-Patch52: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch53: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch54: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch55: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch56: workspace.cmcfixes32.patch
-Patch57: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch58: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch59: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch60: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch61: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch62: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch63: workspace.configrefactor01.patch
-Patch64: workspace.sixtyfour11.patch
-Patch65: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch66: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch67: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch68: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch69: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch70: openoffice.org-2.2.0.rh232389.tango.patch
-Patch71: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch72: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch73: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch74: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch75: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch76: workspace.cmcfixes34.patch
-Patch77: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
-Patch78: openoffice.org-2.2.1.ooo77214.rtfprtdata.sw.patch
+Patch19: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch20: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch21: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch22: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch23: workspace.libxslt02.patch
+Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch25: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch27: workspace.fpicker6.patch
+Patch28: workspace.ppc64one.patch
+Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch30: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch31: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch32: ooobuild.VBAObjects.patch
+Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch36: pseudoworkspace.valgrind1.patch
+Patch37: workspace.thbpp6.patch
+Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch41: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch42: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch43: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch44: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch45: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch46: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch47: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch48: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch49: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
+Patch50: workspace.tl37.patch
+Patch51: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch52: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch53: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch54: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch57: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch58: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch59: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch60: workspace.configrefactor01.patch
+Patch61: workspace.sixtyfour11.patch
+Patch62: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch63: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch64: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch65: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch66: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch67: openoffice.org-2.2.0.rh232389.tango.patch
+Patch68: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch69: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch70: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch71: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch73: workspace.cmcfixes34.patch
+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.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
Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
@@ -142,6 +141,8 @@
Patch83: workspace.glyphadv.patch
Patch84: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
+Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
%define instdir %{_libdir}/openoffice.org
@@ -1000,7 +1001,7 @@
%patch10 -p1 -b .rh161886.rpath.desktop.patch
%patch11 -p1 -b .rh151357.setlangtolocale.patch
%patch12 -p1 -b .rh151356.usetwodotzeropath.patch
-%patch13 -p1 -b .rh156067.noversionedicons.patch
+%patch13 -p1 -b .rh156067.noversionedsysui.patch
%patch14 -p1
%if %{gtkprintui}
%patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
@@ -1008,68 +1009,70 @@
%patch16 -p1 -b .rh156677.cripplemenus.sysui.patch
%patch17 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch18 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch19 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch20 -p1 -b .ooo54603.fontconfig.patch
-%patch21 -p1 -b .ooo51931.fixxmlsec.patch
-%patch22 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch23 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch24 -p1 -b .workspace.libxslt02.patch
-%patch25 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch26 -p1
-%patch27 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch28 -p1 -b .workspace.fpicker6.patch
-%patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch30 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch31 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch32 -p1 -b .rh187919.gtkunderkde.patch
-%patch33 -p0 -b .ooobuild.VBAObjects.patch
-%patch34 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch35 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch36 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch37 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch38 -p1 -b .workspace.thbpp6.patch
-%patch39 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch40 -p1 -b .rh217065.syncbackspace.patch
-%patch41 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch42 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch43 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch44 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH45} >> svtools/source/dialogs/localize.sdf
-%patch46 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch47 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch48 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch49 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch50 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch51 -p1 -b .tl37.patch
-%patch52 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch53 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch54 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch55 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch56 -p1 -b .workspace.cmcfixes32.patch
-%patch57 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch58 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch59 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch60 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch61 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch62 -p1 -b .ooo74401.basctl.boost.patch
-%patch63 -p1 -b .workspace.configrefactor01.patch
-%patch64 -p1 -b .workspace.sixtyfour11.patch
-%patch65 -p1 -b .ooo68717.gstreamer.video.patch
-%patch66 -p1 -b .ooo63159.sal.dtype.patch
-%patch67 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch68 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch69 -p1 -b .ooo75329.xdguserdir.patch
-%patch70 -p1 -b .rh232389.tango.patch
+%patch19 -p1 -b .ooo54603.fontconfig.patch
+%patch20 -p1 -b .ooo51931.fixxmlsec.patch
+%patch21 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch22 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch23 -p1 -b .workspace.libxslt02.patch
+%patch24 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch25 -p1
+%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch27 -p1 -b .workspace.fpicker6.patch
+%patch28 -p1 -b .workspace.ppc64one.patch
+%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch30 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch31 -p1 -b .rh187919.gtkunderkde.patch
+%patch32 -p0 -b .ooobuild.VBAObjects.patch
+%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch37 -p1 -b .workspace.thbpp6.patch
+%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch39 -p1 -b .rh217065.syncbackspace.patch
+%patch40 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch41 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch42 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch43 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH44} >> svtools/source/dialogs/localize.sdf
+%patch45 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch46 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch47 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch48 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch49 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch50 -p1 -b .tl37.patch
+%patch51 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch52 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch53 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch54 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch57 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch58 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch59 -p1 -b .ooo74401.basctl.boost.patch
+%patch60 -p1 -b .workspace.configrefactor01.patch
+%patch61 -p1 -b .workspace.sixtyfour11.patch
+%patch62 -p1 -b .ooo68717.gstreamer.video.patch
+%patch63 -p1 -b .ooo63159.sal.dtype.patch
+%patch64 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch65 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch66 -p1 -b .ooo75329.xdguserdir.patch
+%patch67 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch71 -p1 -b .ooo53397.linkopt.patch
+%patch68 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch72 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch73 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch74 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch75 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch76 -p1 -b .workspace.cmcfixes34.patch
-%patch77 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
-%patch78 -p1 -b .ooo77214.rtfprtdata.sw.patch
+%patch69 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch70 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch71 -p1 -b .oooXXXXX.shell.reduceglobals.patch
+%patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch73 -p1 -b .workspace.cmcfixes34.patch
+%patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
+%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
+%patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
%patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
%patch80 -p1 -b .ooo78383.vcl.printxerror.patch
%patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
@@ -1077,6 +1080,8 @@
%patch83 -p1 -b .workspace.glyphadv.patch
%patch84 -p1 -b .ooo78921.sw.embedded.patch
%patch85 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
+%patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -1092,18 +1097,17 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-jam --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{release} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
-#force linker
-export LINK=$CXX
#faster build
export nodep=true
export NO_HIDS=true
#Set the "This product has been created by..." in Help->About
-export USER="Red Hat, Inc."
-unset USERNAME
+export OOO_VENDOR="Red Hat, Inc."
+#force linker
+export LINK=$CXX
#use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do
case "$i" in
@@ -1111,7 +1115,9 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics"
+export ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64 -finline-limit=64"
+#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+export CXX="$CXX -fno-threadsafe-statics"
#convert _smp_mflags to dmake equivalent
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
@@ -1119,35 +1125,45 @@
#just in case you have a >16 proc box
export MAXPROCESSLIMIT=65535
-# remove when these translations are fixed upstreamed
+#build translation tools and apply extra translations, so
+#this can be removed when these translations are upstreamed
cd transex3/prj
build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
deliver -link
localize -m -x -l bn -f %{SOURCE5}
cd ../..
+#build OOo, on failure make a stab at debugging the crash if any, and
+#rebuild un-parallel
cd instsetoo_native/util
+ulimit -c unlimited
if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
+ echo bt > gdbcmds
+ find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
build --dlv_switch -link --all
fi
-#make no rpms in sysui for menus, but do generate the icons
-cd ../../sysui
-export RPM=true
-export PKGFORMAT=rpm
-build
-deliver -link
-unset PKGFORMAT
+#generate the icons and mime type stuff
+cd ../../sysui/unxlng*/misc/openoffice.org
+export DESTDIR=../../../output
+export KDEMAINDIR=/usr
+export GNOMEDIR=/usr
+export GNOME_MIME_THEME=hicolor
+./create_tree.sh
#start of jakub based suggestion on prelink optimization
-cd ../desktop/source/app
+cd ../../../../desktop/source/app
%if ! %{linkopt}
sed -i -e "s/OBJ/SLO/" makefile.mk
dmake
%endif
cd ../../util
%if ! %{linkopt}
+%if %{stlport_abi_lockin}
`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
+%else
+`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
+%endif
%endif
$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -1237,6 +1253,7 @@
done
popd
+#Set some aliases to canonical autocorrect language files for similar locales
pushd $RPM_BUILD_ROOT/%{instdir}/share/autocorr
en_GB_aliases="en-AU en-BS en-BZ en-CA en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
for lang in $en_GB_aliases; do
@@ -1248,8 +1265,8 @@
done
popd
-#auto generate the langpack file lists
-#langpack id, has help or not, dictionary pattern, other linguistic pattern, script classification
+#auto generate the langpack file lists, format is...
+#langpack id, has help or not, extra linguistic data glob, script classification
langpackdetails=\
(\
af help nolingu western ar nohelp nolingu ctl \
@@ -1313,7 +1330,7 @@
#this src.rpm totally, we'll make links at this time as well
grep -v DICT $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
mv -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
-#remove the dictionaries, they are in hunspell-??
+#remove the dictionaries, they are in hunspell-XX rpms
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/INSTALL_de.txt
#add in some templates
@@ -1324,7 +1341,7 @@
#skip the swahelli for now
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
-#allow gtk file dialog to be default
+#enable gtk file dialog as the default
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
#remove dictooo stuff which we disabled in configure
@@ -1451,12 +1468,11 @@
cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
#get rid of the gnome icons
-rm -rf sysui/unxlng*/misc/redhat/usr/share/icons/gnome
+rm -rf sysui/output/usr/share/icons/gnome
#relocate the rest of them
-cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
-rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
+cp -r sysui/output/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
+cp -r sysui/output/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
+cp -r sysui/output/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses
@@ -1559,6 +1575,7 @@
%{instdir}/presets
%dir %{instdir}/program
%{instdir}/program/JREProperties.class
+%{instdir}/program/about.bmp
%{instdir}/program/acceptor.uno.so
%{instdir}/program/addin
%{instdir}/program/basprov680*.uno.so
@@ -1613,7 +1630,6 @@
%{instdir}/program/gnome-open-url.bin
%{instdir}/program/hatchwindowfactory.uno.so
%{instdir}/program/i18nsearch.uno.so
-%{instdir}/program/implreg.uno.so
%{instdir}/program/intro.bmp
%{instdir}/program/introspection.uno.so
%{instdir}/program/invocadapt.uno.so
@@ -1791,7 +1807,6 @@
%{instdir}/program/libxstor.so
%{instdir}/program/migrationoo2.uno.so
%{instdir}/program/namingservice.uno.so
-%{instdir}/program/nestedreg.uno.so
%{instdir}/program/nsplugin
%{instdir}/program/open-url
%{instdir}/program/passwordcontainer.uno.so
@@ -1802,7 +1817,6 @@
%{instdir}/program/productregistration.uno.so
%{instdir}/program/proxyfac.uno.so
%{instdir}/program/reflection.uno.so
-%{instdir}/program/regtypeprov.uno.so
%{instdir}/program/remotebridge.uno.so
%dir %{instdir}/program/resource
%{instdir}/program/resource/avmedia680en-US.res
@@ -1864,13 +1878,9 @@
%{instdir}/program/resource/xmlsec680en-US.res
%{instdir}/program/resource/xsltdlg680en-US.res
%{instdir}/program/sax.uno.so
-%{instdir}/program/security.uno.so
%{instdir}/program/senddoc
-%{instdir}/program/servicemgr.uno.so
%{instdir}/program/services.rdb
%{instdir}/program/setuprc
-%{instdir}/program/shlibloader.uno.so
-%{instdir}/program/simplereg.uno.so
%{instdir}/program/slideshow.uno.so
%{instdir}/program/setofficelang*
%{instdir}/program/soffice
@@ -1886,8 +1896,6 @@
%{instdir}/program/syssh.uno.so
%{instdir}/program/textinstream.uno.so
%{instdir}/program/textoutstream.uno.so
-%{instdir}/program/typeconverter.uno.so
-%{instdir}/program/typemgr.uno.so
%{instdir}/program/types.rdb
%{instdir}/program/ucpexpand1.uno.so
%{instdir}/program/ucptdoc1.uno.so
@@ -1898,7 +1906,6 @@
%{instdir}/program/unorc
%{instdir}/program/updatefeed.uno.so
%{instdir}/program/uri-encode
-%{instdir}/program/uriproc.uno.so
%{instdir}/program/uuresolver.uno.so
%{instdir}/program/vbaevents*.uno.so
%{instdir}/program/vclcanvas.uno.so
@@ -2133,7 +2140,7 @@
%{_datadir}/mime-info/*
%{instdir}/program/libxmlsecurity.so
%{instdir}/program/liboldxmlsec*
-%if %{stlvisibilityfcked}
+%if %{stlport_abi_lockin}
%{instdir}/program/libstlport*.so
%endif
%dir %{_datadir}/mimelnk
@@ -2141,6 +2148,7 @@
%{_datadir}/mimelnk/application/*extension*
#linkopt libs
%if ! %{linkopt}
+#crude merge ones
%{instdir}/program/behelper.uno.so
%{instdir}/program/configmgr2.uno.so
%{instdir}/program/desktopbe1.uno.so
@@ -2182,6 +2190,22 @@
%{instdir}/program/localebe1.uno.so
%{instdir}/program/sysmgr1.uno.so
%{instdir}/program/ucpgvfs1.uno.so
+#stocmerge bootstrap
+%{instdir}/program/implreg.uno.so
+%{instdir}/program/nestedreg.uno.so
+%{instdir}/program/regtypeprov.uno.so
+%{instdir}/program/security.uno.so
+%{instdir}/program/servicemgr.uno.so
+%{instdir}/program/shlibloader.uno.so
+%{instdir}/program/simplereg.uno.so
+%{instdir}/program/typemgr.uno.so
+#stocmerge nonbootstrap
+%{instdir}/program/typeconverter.uno.so
+%{instdir}/program/uriproc.uno.so
+%else
+#stocmerge ones
+%{instdir}/program/bootstrap.uno.so
+%{instdir}/program/stocservices.uno.so
%endif
%post core
@@ -2654,13 +2678,27 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Wed Jun 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.12.UNRELEASED
+* Thu Jul 26 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
- Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
- Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
- Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
- Resolves: rhbz#244656 overlapping glyphs in pdf export
- Resolves: rhbz#247781 openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+- Resolves: ooo#79953 inhibit screensaver during presentations
+- Resolves: rhbz#249196 propogate font width types up from the font ooo#79878
+- Resolves: rhbz#249568 empty line in autocorrect options
+- Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
+- Resolves: rhbz#244656 overlapping glyphs in pdf export
+- Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
+- Resolves: rhbz#243904 add openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
+- Resolves: rhbz#216332 use cups for all duplex and printer features
+- update setlangtolocale for prettier fonts when appropiate langpack is missing
- add openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+- add openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch fix
+- add workspace.cmcfixes34.patch for int(0) not being promoted to long
+ NULL in ellipsed methods
+- drop integrated openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
+- drop integrated workspace.cmcfixes32.patch
* Fri Jun 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.11
- Resolves: rhbz#243305 missing xdg file for quickstart restart
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pseudoworkspace.valgrind1.patch 5 Apr 2007 14:32:28 -0000 1.17
+++ pseudoworkspace.valgrind1.patch 26 Jul 2007 20:16:50 -0000 1.18
@@ -85,19 +85,3 @@
BYTE nVer;
if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
{
-Index: source/core/txtnode/thints.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
-retrieving revision 1.43.36.6
-diff -u -r1.43.36.6 thints.cxx
---- openoffice.org.orig/sw/source/core/txtnode/thints.cxx 20 Mar 2007 12:48:03 -0000 1.43.36.6
-+++ openoffice.org/sw/source/core/txtnode/thints.cxx 5 Apr 2007 14:25:12 -0000
-@@ -2138,7 +2138,7 @@
-
- BuildPortions( rNode, *pHint, nMode );
-
-- if ( nHtStart < *pHtEnd ) // skip merging for 0-length attributes
-+ if ( nHtStart < nHintEnd ) // skip merging for 0-length attributes
- MergePortions( rNode );
- }
- else
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/sources,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- sources 30 Apr 2007 16:47:27 -0000 1.238
+++ sources 26 Jul 2007 20:16:50 -0000 1.239
@@ -3,5 +3,5 @@
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
-f6f7bff8c668481ddb2c67f6a6eb3027 OOF680_m14.tar.bz2
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
+db12596a2a667fb5c2a6c8467dcc9223 OOF680_m18.tar.bz2
workspace.configrefactor01.patch:
Index: workspace.configrefactor01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.configrefactor01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.configrefactor01.patch 21 Feb 2007 16:57:15 -0000 1.1
+++ workspace.configrefactor01.patch 26 Jul 2007 20:16:50 -0000 1.2
@@ -8153,8 +8153,8 @@
public:
- ChildList& GetSet() {return m_aChildList;}
- ChildList const& GetSet() const {return m_aChildList;}
-+ ChildList::iterator begin() const { return const_cast<configmgr::INode **>(m_aChildList.begin()); }
-+ ChildList::iterator end() const { return const_cast<configmgr::INode **>(m_aChildList.end()); }
++ ChildList::iterator begin() const { return const_cast<ChildList*>(&m_aChildList)->begin(); }
++ ChildList::iterator end() const { return const_cast<ChildList*>(&m_aChildList)->end(); }
+ INode *erase(INode *pNode);
+ ChildList::iterator find(INode *pNode) const;
+ std::pair<ChildList::iterator, bool> insert(INode *aInsert);
--- openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch DELETED ---
--- workspace.cmcfixes32.patch DELETED ---
- Previous message (by thread): rpms/xfsdump/F-7 .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message (by thread): rpms/openoffice.org/F-7 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, NONE, 1.1 openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, NONE, 1.1 workspace.ppc64one.patch, NONE, 1.1 openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.2, NONE openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch, 1.4, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list