rpms/openoffice.org/F-7 openoffice.org-1.9.115.ooo69368.fixxmlsec.patch, NONE, 1.1 openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, NONE, 1.1 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, NONE, 1.1 openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch, NONE, 1.1 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, NONE, 1.1 openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch, NONE, 1.1 openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch, NONE, 1.1 ooobuild.VBAObjects.patch, 1.15, NONE openoffice.org-1.9.115.ooo51931.fixxmlsec.patch, 1.2, NONE openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, 1.7, NONE openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.4, NONE openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, 1.4, NONE openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch, 1.3, NONE openoffice.org-1.9.97.rh156067.noversionedsysui.patch, 1.1, NONE openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, 1.4, NONE openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch, 1.1, NONE openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.14, NONE openoffice.org-2.0.3.rh187919.gtkunderkde.patch, 1.3, NONE openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch, 1.1, NONE openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch, 1.6, NONE openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch, 1.1, NONE openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch, 1.1, NONE openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch, 1.1, NONE openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch, 1.1, NONE openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch, 1.1, NONE openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch, 1.1, NONE openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, 1.5, NONE openoffice.org-2.2.0.ooo74401.basctl.boost.patch, 1.2, NONE openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch, 1.1, NONE openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, 1.1, NONE openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch, 1.2, NONE openoffice.org-2.2.0.ooo75329.xdguserdir.patch, 1.1, NONE openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch, 1.1, NONE openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch, 1.1, NONE openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch, 1.2, NONE openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch, 1.1, NONE openoffice.org-2.2.1.ooo77214.rtfprtdata.sw.patch, 1.1, NONE openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch, 1.2, NONE openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch, 1.1, NONE openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch, 1.1, NONE openoffice.org-2.2.1.ooo78921.sw.embedded.patch, 1.1, NONE openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch, 1.1, NONE openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch, 1.1, NONE openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch, 1.1, NONE openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch, 1.1, NONE openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch, 1.3, NONE openoffice.org.ooo79953.dbusinhibitscreensaver.patch, 1.2, NONE workspace.cmcfixes34.patch, 1.1, NONE workspace.glyphadv.patch, 1.1, NONE workspace.libxslt02.patch, 1.6, NONE workspace.ppc64one.patch, 1.1, NONE workspace.sixtyfour11.patch, 1.6, NONE workspace.thbpp6.patch, 1.1, NONE workspace.tipatch8.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Oct 10 18:45:21 UTC 2007
- Previous message (by thread): rpms/squirrelmail/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 squirrelmail.spec, 1.54, 1.55
- Next message (by thread): rpms/dirac/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 dirac.spec, 1.4, 1.5
- 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-serv15627
Added Files:
openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
Removed Files:
ooobuild.VBAObjects.patch
openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
openoffice.org-1.9.97.rh156067.noversionedsysui.patch
openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
openoffice.org-2.0.3.rh187919.gtkunderkde.patch
openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
openoffice.org-2.2.0.ooo74401.basctl.boost.patch
openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
openoffice.org-2.2.0.ooo75329.xdguserdir.patch
openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
openoffice.org-2.2.1.ooo77214.rtfprtdata.sw.patch
openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
openoffice.org-2.2.1.ooo78921.sw.embedded.patch
openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
openoffice.org.ooo79953.dbusinhibitscreensaver.patch
workspace.cmcfixes34.patch workspace.glyphadv.patch
workspace.libxslt02.patch workspace.ppc64one.patch
workspace.sixtyfour11.patch workspace.thbpp6.patch
workspace.tipatch8.patch
Log Message:
bump
openoffice.org-1.9.115.ooo69368.fixxmlsec.patch:
--- NEW FILE openoffice.org-1.9.115.ooo69368.fixxmlsec.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/libxmlsec/makefile.mk 31 Jan 2006 18:27:29 -0000 1.8
+++ openoffice.org/libxmlsec/makefile.mk 10 Aug 2006 13:55:31 -0000
@@ -157,16 +157,16 @@
OUTDIR2INC=include$/xmlsec
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib
+OUT2LIB+=src$/.libs$/liboldxmlsec1.*dylib src$/nss$/.libs$/liboldxmlsec1-nss.*dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
-OUT2BIN+=src$/.libs$/libxmlsec1-1.dll src$/nss$/.libs$/libxmlsec1-nss-1.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto-1.dll
+OUT2BIN+=src$/.libs$/liboldxmlsec1-1.dll src$/nss$/.libs$/liboldxmlsec1-nss-1.dll src$/mscrypto$/.libs$/liboldxmlsec1-mscrypto-1.dll
.ELSE
OUT2LIB+=win32$/binaries$/*.lib
OUT2BIN+=win32$/binaries$/*.dll
.ENDIF
.ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so*
+OUT2LIB+=src$/.libs$/liboldxmlsec1.so* src$/nss$/.libs$/liboldxmlsec1-nss.so*
.ENDIF
# --- Targets ------------------------------------------------------
Index: xmlsec1-1.2.6.patch
===================================================================
RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
retrieving revision 1.13
diff -u -r1.13 xmlsec1-1.2.6.patch
--- openoffice.org.orig/libxmlsec/xmlsec1-1.2.6.patch 9 Mar 2006 10:18:52 -0000 1.13
+++ openoffice.org/libxmlsec/xmlsec1-1.2.6.patch 10 Aug 2006 13:55:49 -0000
@@ -14178,3 +14178,348 @@
XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
+*** misc/xmlsec1-1.2.6/src/Makefile.in 2006-08-10 14:25:07.000000000 +0100
+--- misc/build/xmlsec1-1.2.6/src/Makefile.in 2006-08-10 14:26:01.000000000 +0100
+***************
+*** 14,20 ****
+
+ @SET_MAKE@
+
+! SOURCES = $(libxmlsec1_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- 14,20 ----
+
+ @SET_MAKE@
+
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+***************
+*** 50,59 ****
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! libxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+! am__libxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+ buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+ keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+ parser.c soap.c strings.c templates.c transforms.c x509.c \
+--- 50,59 ----
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! liboldxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+! am__liboldxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+ buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+ keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+ parser.c soap.c strings.c templates.c transforms.c x509.c \
+***************
+*** 64,76 ****
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@ $(am__objects_1)
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 = \
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@ $(am__objects_1)
+! am_libxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+ buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+ keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+ nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+ transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+ xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! libxmlsec1_la_OBJECTS = $(am_libxmlsec1_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+--- 64,76 ----
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@ $(am__objects_1)
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 = \
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@ $(am__objects_1)
+! am_liboldxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+ buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+ keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+ nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+ transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+ xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! liboldxmlsec1_la_OBJECTS = $(am_liboldxmlsec1_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+***************
+*** 97,104 ****
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__libxmlsec1_la_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+--- 97,104 ----
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__liboldxmlsec1_la_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+***************
+*** 347,356 ****
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! libxmlsec1.la \
+ $(NULL)
+
+! libxmlsec1_la_SOURCES = \
+ $(LTDL_SOURCE_FILES) \
+ app.c \
+ base64.c \
+--- 347,356 ----
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! liboldxmlsec1.la \
+ $(NULL)
+
+! liboldxmlsec1_la_SOURCES = \
+ $(LTDL_SOURCE_FILES) \
+ app.c \
+ base64.c \
+***************
+*** 383,395 ****
+ xslt.c \
+ $(NULL)
+
+! libxmlsec1_la_LIBADD = \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(XMLSEC_DL_LIBS) \
+ $(NULL)
+
+! libxmlsec1_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+--- 383,395 ----
+ xslt.c \
+ $(NULL)
+
+! liboldxmlsec1_la_LIBADD = \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(XMLSEC_DL_LIBS) \
+ $(NULL)
+
+! liboldxmlsec1_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+***************
+*** 466,473 ****
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! libxmlsec1.la: $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(libxmlsec1_la_LDFLAGS) $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- 466,473 ----
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! liboldxmlsec1.la: $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(liboldxmlsec1_la_LDFLAGS) $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+*** misc/xmlsec1-1.2.6/src/nss/Makefile.in 2004-08-26 08:00:31.000000000 +0200
+--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in 2006-02-24 17:41:54.977876000 +0100
+***************
+*** 14,20 ****
+
+ @SET_MAKE@
+
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- 14,20 ----
+
+ @SET_MAKE@
+
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+***************
+*** 50,64 ****
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! libxmlsec1_nss_la_DEPENDENCIES = ../libxmlsec1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+! am_libxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+ digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+ x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+ $(am__objects_1)
+! libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+--- 50,64 ----
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! liboldxmlsec1_nss_la_DEPENDENCIES = ../liboldxmlsec1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+! am_liboldxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+ digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+ x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+ $(am__objects_1)
+! liboldxmlsec1_nss_la_OBJECTS = $(am_liboldxmlsec1_nss_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+***************
+*** 78,85 ****
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(libxmlsec1_nss_la_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+--- 78,85 ----
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+***************
+*** 317,326 ****
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! libxmlsec1-nss.la \
+ $(NULL)
+
+! libxmlsec1_nss_la_SOURCES = \
+ akmngr.c \
+ app.c \
+ bignum.c \
+--- 317,326 ----
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! liboldxmlsec1-nss.la \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_SOURCES = \
+ akmngr.c \
+ app.c \
+ bignum.c \
+***************
+*** 339,352 ****
+ x509vfy.c \
+ $(NULL)
+
+! libxmlsec1_nss_la_LIBADD = \
+! ../libxmlsec1.la \
+ $(NSS_LIBS) \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+
+! libxmlsec1_nss_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+--- 339,352 ----
+ x509vfy.c \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_LIBADD = \
+! ../liboldxmlsec1.la \
+ $(NSS_LIBS) \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+***************
+*** 410,417 ****
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! libxmlsec1-nss.la: $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(libxmlsec1_nss_la_LDFLAGS) $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- 410,417 ----
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! liboldxmlsec1-nss.la: $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(liboldxmlsec1_nss_la_LDFLAGS) $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- build/xmlsec1-1.2.6/configure 2006-08-14 15:55:25.000000000 +0100
++++ misc/build/xmlsec1-1.2.6/configure 2006-08-14 15:56:46.000000000 +0100
+@@ -25769,23 +25769,23 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" >&5
+-echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
++echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" ; then
++ if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+ echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+- NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+ echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+ echo "${ECHO_T}$NSS_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+ echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+- NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+ echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+ echo "${ECHO_T}$NSS_LIBS" >&6
+ else
+@@ -25793,7 +25793,7 @@
+ NSS_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+- NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+
+ fi
+
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.202.4.1
diff -u -r1.202.4.1 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp 27 Jun 2006 07:52:52 -0000 1.202.4.1
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp 10 Aug 2006 13:41:41 -0000
@@ -2392,9 +2392,9 @@
TXT_FILE_BODY;
#ifdef UNX
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1.1.2.6,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+ Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1.2.6));
#endif
#else
Name = "libxmlsec.dll";
@@ -2416,9 +2416,9 @@
File gid_File_Lib_LibXMLSec_xmlsecnss
TXT_FILE_BODY;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss.1.2.6,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
+ Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1.2.6));
#endif
Dir = gid_Dir_Program;
Styles = (PACKED,PATCH);
Index: source/ooo/shortcut_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/shortcut_ooo.scp,v
retrieving revision 1.20
diff -u -r1.20 shortcut_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp 9 Sep 2005 01:42:03 -0000 1.20
+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp 10 Aug 2006 13:41:41 -0000
@@ -430,9 +430,9 @@
FileID = gid_File_Lib_LibXMLSec_xmlseccore;
Dir = gid_Dir_Program;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1.1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1.1,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1));
+ Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1));
#endif
Styles = (NETWORK,RELATIVE);
End
@@ -442,7 +442,7 @@
Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore_2
ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlseccore;
Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libxmlsec1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
#endif
@@ -452,9 +452,9 @@
FileID = gid_File_Lib_LibXMLSec_xmlsecnss;
Dir = gid_Dir_Program;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1-nss.1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss.1,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1));
+ Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1));
#endif
Styles = (NETWORK,RELATIVE);
End
@@ -464,7 +464,7 @@
Shortcut gid_Shortcut_Lib_LibXMLSec_xmlsecnss_2
ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlsecnss;
Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libxmlsec1-nss,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
#endif
Index: inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
retrieving revision 1.98
diff -u -r1.98 libs.mk
--- openoffice.org.orig/solenv/inc/libs.mk 7 Apr 2006 14:23:23 -0000 1.98
+++ openoffice.org/solenv/inc/libs.mk 10 Aug 2006 13:42:25 -0000
@@ -149,11 +149,11 @@
TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB=-lxmlsec1-1
-XMLSECLIB-NSS=-lxmlsec1-nss-1
+XMLSECLIB=-loldxmlsec1-1
+XMLSECLIB-NSS=-loldxmlsec1-nss-1
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB=-lxmlsec1
-XMLSECLIB-NSS=-lxmlsec1-nss
+XMLSECLIB=-loldxmlsec1
+XMLSECLIB-NSS=-loldxmlsec1-nss
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.IF "$(GUI)$(COM)"=="WNTGCC"
LIBXML2LIB=-lxml2-2
@@ -165,7 +165,7 @@
PLC4LIB=-lplc4
NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB-MS=-lxmlsec1-mscrypto-1
+XMLSECLIB-MS=-loldxmlsec1-mscrypto-1
MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
BROOKERLIB=-lbrooker$(OFFICEUPD)$(DLLPOSTFIX)
openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch:
--- NEW FILE openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch ---
Index: source/javavm/javavm.cxx
===================================================================
RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
retrieving revision 1.72
diff -u -p -u -r1.72 javavm.cxx
--- openoffice.org.orig/stoc/source/javavm/javavm.cxx 3 Jan 2006 12:44:05 -0000 1.72
+++ openoffice.org/stoc/source/javavm/javavm.cxx 30 Jan 2006 10:12:21 -0000
@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
{
case JFW_E_NONE: bStarted = true; break;
case JFW_E_NO_SELECT:
+ case JFW_E_VM_CREATION_FAILED:
{
// No Java configured. We silenty run the java configuration
// Java.
@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
continue;
break;
}
+#if 0
case JFW_E_VM_CREATION_FAILED:
{
//Error:
@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
askForRetry(css::uno::makeAny(exc));
return css::uno::Any();
}
+#endif
case JFW_E_RUNNING_JVM:
{
//This service should make sure that we do not start java twice.
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.12
diff -u -r1.12 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Sep 2006 10:54:01 -0000 1.12
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Nov 2006 16:04:59 -0000
@@ -67,7 +67,6 @@
{
static char const* ar[]= {
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
- "/gcj-4.1.1/libjvm.so",
"/libgcj.so.7",
"/libgcj.so.6"
};
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:
--- NEW FILE openoffice.org-2.0.3.ooo80816.selinux.bridges.patch ---
Index: inc/bridges/cpp_uno/shared/vtablefactory.hxx
===================================================================
RCS file: /cvs/udk/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx,v
retrieving revision 1.5
diff -u -r1.5 vtablefactory.hxx
--- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 2 May 2006 11:59:11 -0000 1.5
+++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 17 May 2006 10:57:45 -0000
@@ -60,11 +60,21 @@
skipping an RTTI pointer, see mapBlockToVtable). Also, the block
contains any generated code snippets, after the vtable itself.
*/
- void * start;
+ int fd;
+ void * writep;
+ void * execp;
+ int * ref;
/** The size of the raw vtable block, in bytes.
*/
sal_Size size;
+ Block(sal_Size nSize);
+ Block(const Block &rOther);
+ ~Block();
+ Block();
+ Block& operator=(const Block& rOther);
+ void swapwriteandexec();
+ void release();
};
/** The vtable structure corresponding to an interface type.
@@ -110,8 +120,6 @@
VtableFactory(VtableFactory &); // not implemented
void operator =(VtableFactory); // not implemented
- void freeBlock(Block const & block) const;
-
void createVtables(
GuardedBlocks & blocks, BaseOffset const & baseOffset,
typelib_InterfaceTypeDescription * type, bool includePrimary) const;
@@ -162,7 +170,7 @@
@return a pointer to the remaining code snippet area
*/
static unsigned char * 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);
@@ -181,8 +189,6 @@
osl::Mutex m_mutex;
Map m_map;
-
- rtl_arena_type * m_arena;
};
} } }
Index: source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx,v
retrieving revision 1.10
diff -u -r1.10 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2 May 2006 12:01:33 -0000 1.10
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 17 May 2006 10:57:47 -0000
@@ -361,7 +361,7 @@
int const codeSnippetSize = 16;
unsigned char * codeSnippet(
- unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
+ unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
typelib_TypeClass returnTypeClass)
{
if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
@@ -407,7 +407,7 @@
// jmp privateSnippetExecutor:
*p++ = 0xE9;
*reinterpret_cast< sal_Int32 * >(p)
- = ((unsigned char *) exec) - p - sizeof (sal_Int32);
+ = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff;
p += sizeof (sal_Int32);
OSL_ASSERT(p - code <= codeSnippetSize);
return code + codeSnippetSize;
@@ -434,7 +434,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)
{
@@ -445,9 +445,9 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
member)->pAttributeTypeRef->eTypeClass);
// Setter:
@@ -455,17 +455,17 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
typelib_TypeClass_VOID);
}
break;
case typelib_TypeClass_INTERFACE_METHOD:
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
member)->pReturnTypeRef->eTypeClass);
break;
Index: source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx,v
retrieving revision 1.8
diff -u -r1.8 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 2 May 2006 12:02:15 -0000 1.8
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 17 May 2006 10:57:47 -0000
@@ -676,7 +676,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)
{
@@ -692,7 +692,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(
@@ -705,13 +705,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(
Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx,v
retrieving revision 1.5
diff -u -r1.5 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 2 May 2006 12:03:36 -0000 1.5
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 17 May 2006 10:57:48 -0000
@@ -487,7 +487,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 nFunctionOffset,
sal_Int32 functionCount, sal_Int32 nVtableOffset )
{
@@ -504,14 +504,14 @@
reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
// get method
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
if ( ! pAttrTD->bReadOnly )
{
// set method
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
}
}
@@ -520,7 +520,7 @@
typelib_InterfaceMethodTypeDescription *pMethodTD =
reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
- *slots++ = code;
+ *slots++ = code + writetoexecdiff;
code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
}
Index: source/cpp_uno/shared/cppinterfaceproxy.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx,v
retrieving revision 1.4
diff -u -r1.4 cppinterfaceproxy.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 2 May 2006 12:07:01 -0000 1.4
+++ openoffice.org/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 17 May 2006 10:57:48 -0000
@@ -89,7 +89,7 @@
pMemory.release());
for (sal_Int32 i = 0; i < aVtables.count; ++i) {
pProxy->vtables[i] = VtableFactory::mapBlockToVtable(
- aVtables.blocks[i].start);
+ aVtables.blocks[i].writep);
}
return castProxyToInterface(pProxy);
}
Index: source/cpp_uno/shared/vtablefactory.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/shared/vtablefactory.cxx,v
retrieving revision 1.5
diff -u -r1.5 vtablefactory.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/shared/vtablefactory.cxx 2 May 2006 12:07:18 -0000 1.5
+++ openoffice.org/bridges/source/cpp_uno/shared/vtablefactory.cxx 17 May 2006 10:57:48 -0000
@@ -41,6 +41,9 @@
#include "osl/diagnose.h"
#include "osl/mutex.hxx"
+#include "osl/thread.h"
+#include "osl/security.hxx"
+#include "osl/file.hxx"
#include "rtl/alloc.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -53,6 +56,7 @@
#if defined SAL_UNX
#include <unistd.h>
#include <sys/mman.h>
+#include <stdio.h>
#elif defined SAL_W32
#define WIN32_LEAN_AND_MEAN
#pragma warning(push,1) // disable warnings within system headers
@@ -64,9 +68,12 @@
using bridges::cpp_uno::shared::VtableFactory;
-namespace {
+VtableFactory::Block::Block() : fd(-1), writep(0), execp(0), ref(0), size(0)
+{
+}
-extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
+VtableFactory::Block::Block(sal_Size nSize) : fd(-1), writep(0), execp(0), ref(0), size(0)
+{
sal_Size pagesize;
#if defined SAL_UNX
#if defined FREEBSD || defined NETBSD
@@ -79,40 +86,112 @@
GetSystemInfo(&info);
pagesize = info.dwPageSize;
#endif
- sal_Size n = (*size + (pagesize - 1)) & ~(pagesize - 1);
- void * p;
+ sal_Size n = (nSize + (pagesize - 1)) & ~(pagesize - 1);
#if defined SAL_UNX
- p = mmap(
- 0, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1,
- 0);
- if (p == MAP_FAILED) {
- p = 0;
- }
- else if (mprotect (static_cast<char*>(p), n, PROT_READ | PROT_WRITE | PROT_EXEC) == -1)
- {
- munmap (static_cast<char*>(p), n);
- p = 0;
- }
+ osl::Security aSecurity;
+ rtl::OUString strDirectory;
+ rtl::OUString strURLDirectory;
+ if (aSecurity.getHomeDir(strURLDirectory))
+ osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
+
+ for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+ {
+ if (!strDirectory.getLength())
+ strDirectory = rtl::OUString::createFromAscii("/tmp");
+
+ strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
+ rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
+ char *tmpfname = new char[aTmpName.getLength()+1];
+ strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
+ if ((fd = mkstemp(tmpfname)) == -1)
+ perror("creation of executable memory area failed");
+ if (fd == -1)
+ {
+ delete[] tmpfname;
+ break;
+ }
+ unlink(tmpfname);
+ delete[] tmpfname;
+ ftruncate(fd, nSize);
+ writep = mmap(NULL, n, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (writep == MAP_FAILED) {
+ writep = 0;
+ }
+ execp = mmap(NULL, n, PROT_READ | PROT_EXEC, MAP_SHARED, fd, 0);
+ if (execp == MAP_FAILED) {
+ execp = 0;
+ }
+
+ if (writep && execp && fd != -1)
+ break;
+
+ if (writep) munmap(writep, size);
+ writep = 0;
+ if (execp) munmap(execp, size);
+ execp = 0;
+ if (fd != -1) close(fd);
+ fd = -1;
+ strDirectory = rtl::OUString();
+ }
#elif defined SAL_W32
p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
#endif
- if (p != 0) {
- *size = n;
+ if (writep || execp || fd != -1) {
+ size = n;
+ ref = new int(1);
+ }
+ if (!writep || !execp || fd == -1)
+ {
+ fprintf(stderr, "FATAL ERROR, could not mmap a file for executable memory either in home dir or in /tmp\n");
+ fprintf(stderr, "Cannot continue, perhaps examine your mount options for those directories, or selinux\n");
+ exit(-1);
}
- return p;
}
-extern "C" void SAL_CALL freeExec(
- rtl_arena_type *, void * address, sal_Size size)
+void VtableFactory::Block::release()
{
+ if (ref)
+ {
+ (*ref)--;
+ if (*ref == 0)
+ {
#if defined SAL_UNX
- munmap(static_cast< char * >(address), size);
+ if (writep) munmap(writep, size);
+ if (execp) munmap(execp, size);
+ if (fd != -1) close(fd);
#elif defined SAL_W32
- (void) size; // unused
- VirtualFree(address, 0, MEM_RELEASE);
+ VirtualFree(start, 0, MEM_RELEASE);
#endif
+ delete ref;
+ }
+ }
}
+VtableFactory::Block::~Block()
+{
+ release();
+}
+
+VtableFactory::Block::Block(const Block& rOther) : fd(rOther.fd), writep(rOther.writep), execp(rOther.execp), ref(rOther.ref), size(rOther.size)
+{
+ if (ref) (*ref)++;
+}
+
+VtableFactory::Block& VtableFactory::Block::operator=(const VtableFactory::Block& rOther)
+{
+ release();
+ fd = rOther.fd;
+ writep = rOther.writep;
+ execp = rOther.execp;
+ size = rOther.size;
+ ref = rOther.ref;
+ if (ref) (*ref)++;
+ return *this;
+}
+
+void VtableFactory::Block::swapwriteandexec()
+{
+ ::std::swap(writep, execp);
}
class VtableFactory::GuardedBlocks: public std::vector< Block > {
@@ -133,11 +213,6 @@
};
VtableFactory::GuardedBlocks::~GuardedBlocks() {
- if (m_guarded) {
- for (iterator i(begin()); i != end(); ++i) {
- m_factory.freeBlock(*i);
- }
- }
}
class VtableFactory::BaseOffset {
@@ -172,28 +247,17 @@
return offset;
}
-VtableFactory::VtableFactory(): m_arena(
- rtl_arena_create(
- "bridges::cpp_uno::shared::VtableFactory",
- sizeof (void *), // to satisfy alignment requirements
- 0, reinterpret_cast< rtl_arena_type * >(-1), allocExec, freeExec, 0))
+VtableFactory::VtableFactory()
{
- if (m_arena == 0) {
- throw std::bad_alloc();
- }
}
VtableFactory::~VtableFactory() {
{
osl::MutexGuard guard(m_mutex);
for (Map::iterator i(m_map.begin()); i != m_map.end(); ++i) {
- for (sal_Int32 j = 0; j < i->second.count; ++j) {
- freeBlock(i->second.blocks[j]);
- }
delete[] i->second.blocks;
}
}
- rtl_arena_destroy(m_arena);
}
VtableFactory::Vtables VtableFactory::getVtables(
@@ -221,10 +285,6 @@
return i->second;
}
-void VtableFactory::freeBlock(Block const & block) const {
- rtl_arena_free(m_arena, block.start, block.size);
-}
-
void VtableFactory::createVtables(
GuardedBlocks & blocks, BaseOffset const & baseOffset,
typelib_InterfaceTypeDescription * type, bool includePrimary) const
@@ -232,17 +292,16 @@
if (includePrimary) {
sal_Int32 slotCount
= bridges::cpp_uno::shared::getPrimaryFunctions(type);
- Block block;
- block.size = getBlockSize(slotCount);
- block.start = rtl_arena_alloc(m_arena, &block.size);
- if (block.start == 0) {
+ Block block(getBlockSize(slotCount));
+ if (block.writep == 0 || block.execp == 0) {
throw std::bad_alloc();
}
try {
- void ** slots = initializeBlock(block.start) + slotCount;
+ void ** slots = initializeBlock(block.writep) + slotCount;
unsigned char * codeBegin =
reinterpret_cast< unsigned char * >(slots);
unsigned char * code = codeBegin;
+ sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep);
sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
for (typelib_InterfaceTypeDescription const * type2 = type;
type2 != 0; type2 = type2->pBaseTypeDescription)
@@ -251,14 +310,14 @@
= bridges::cpp_uno::shared::getLocalFunctions(type2);
slots -= functionCount;
code = addLocalFunctions(
- slots, code, type2,
+ slots, code, writetoexecdiff, type2,
baseOffset.getFunctionOffset(type2->aBase.pTypeName),
functionCount, vtableOffset);
}
flushCode(codeBegin, code);
+ block.swapwriteandexec();
blocks.push_back(block);
} catch (...) {
- freeBlock(block);
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
@@ -666,7 +666,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)
{
@@ -682,7 +682,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(
@@ -695,13 +695,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.2.1.ooo78971.xmloff.outofrange.patch:
--- NEW FILE openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch ---
Index: source/draw/ximpshap.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/draw/ximpshap.cxx,v
retrieving revision 1.117.8.1
diff -u -r1.117.8.1 ximpshap.cxx
--- openoffice.org.orig/xmloff/source/draw/ximpshap.cxx 12 Apr 2007 17:17:24 -0000 1.117.8.1
+++ openoffice.org/xmloff/source/draw/ximpshap.cxx 15 Jun 2007 09:43:30 -0000
@@ -615,6 +615,10 @@
{
::basegfx::B2DHomMatrix aTransformation;
+ DBG_ASSERT(maSize.Height < SAL_MAX_INT32/2 && maSize.Width < SAL_MAX_INT32/2, "unlikely shape size");
+ if (maSize.Height > SAL_MAX_INT32/2 || maSize.Width > SAL_MAX_INT32/2)
+ maSize.Width = maSize.Height = 1;
+
if(maSize.Width != 1 || maSize.Height != 1)
{
// take care there are no zeros used by error
Index: source/sdr/contact/viewobjectcontact.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/sdr/contact/viewobjectcontact.cxx,v
retrieving revision 1.13
diff -u -r1.13 viewobjectcontact.cxx
--- openoffice.org.orig/svx/source/sdr/contact/viewobjectcontact.cxx 14 Nov 2006 13:32:04 -0000 1.13
+++ openoffice.org/svx/source/sdr/contact/viewobjectcontact.cxx 15 Jun 2007 09:43:46 -0000
@@ -376,13 +376,20 @@
// handle paint of ViewObjectContact
if(GetViewContact().ShouldPaintObject(rDisplayInfo, *this) && rDisplayInfo.DoContinuePaint())
{
- if(pRedirector)
+ try
{
- pRedirector->PaintObject(*this, rDisplayInfo);
+ if(pRedirector)
+ {
+ pRedirector->PaintObject(*this, rDisplayInfo);
+ }
+ else
+ {
+ PaintObject(rDisplayInfo);
+ }
}
- else
+ catch ( ... )
{
- PaintObject(rDisplayInfo);
+ DBG_ASSERT(0, "failed to paint object");
}
}
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:
--- NEW FILE openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch ---
Index: inc/cmdid.h
===================================================================
RCS file: /cvs/sw/sw/inc/cmdid.h,v
retrieving revision 1.72
diff -u -r1.72 cmdid.h
--- openoffice.org.orig/sw/inc/cmdid.h 27 Jun 2007 13:12:47 -0000 1.72
+++ openoffice.org/sw/inc/cmdid.h 10 Jul 2007 12:54:59 -0000
@@ -539,6 +539,8 @@
#define FN_SET_PAGE_STYLE (FN_FORMAT + 93) /* Anwenden Seitenv. */
+#define FN_FORMAT_TITLEPAGE_DLG (FN_FORMAT + 98) /* Title Page */
+
#define FN_TABLE_REP (FN_FORMAT + 99) /* TableRepresentation */
#define FN_CONVERT_TEXT_TABLE (FN_FORMAT + 100) /* Konvertierung Text <-> Tabelle */
Index: inc/doc.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/doc.hxx,v
retrieving revision 1.138
diff -u -r1.138 doc.hxx
--- openoffice.org.orig/sw/inc/doc.hxx 27 Jun 2007 13:13:17 -0000 1.138
+++ openoffice.org/sw/inc/doc.hxx 10 Jul 2007 12:55:02 -0000
@@ -758,6 +758,7 @@
virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
+ VirtualDevice* ConstructVirtualDevice(bool bMSO_or_PDF=0) const;
virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
virtual const JobSetup* getJobsetup() const;
Index: inc/globals.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/globals.hrc,v
retrieving revision 1.16
diff -u -r1.16 globals.hrc
--- openoffice.org.orig/sw/inc/globals.hrc 2 May 2006 15:13:43 -0000 1.16
+++ openoffice.org/sw/inc/globals.hrc 10 Jul 2007 12:55:08 -0000
@@ -282,17 +282,19 @@
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104)
-//maximum: RC_GLOBALS_BEGIN + 119
+#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105)
+//maximum: RC_GLOBALS_BEGIN + 120
#if STR_DOC_STAT > RC_GLOBALS_END
#error Resource-Id Ueberlauf in #file, #line
#endif
//CHINA001 for PageCreated
-#define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114)
-#define SID_FONTMODE_TYPE (RC_GLOBALS_BEGIN + 115)
-#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
+#define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114)
+#define SID_FONTMODE_TYPE (RC_GLOBALS_BEGIN + 115)
+#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
#define SID_WRT_SHELL (RC_GLOBALS_BEGIN + 117)
//CHINA001 for SwLineNumberingDlg
-#define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
+#define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
+#define DLG_TITLEPAGE (RC_GLOBALS_BEGIN + 119)
#endif // _GLOBALS_HRC
Index: inc/helpid.h
===================================================================
RCS file: /cvs/sw/sw/inc/helpid.h,v
retrieving revision 1.30
diff -u -r1.30 helpid.h
--- openoffice.org.orig/sw/inc/helpid.h 2 Jan 2007 16:45:16 -0000 1.30
+++ openoffice.org/sw/inc/helpid.h 10 Jul 2007 12:55:09 -0000
@@ -986,3 +986,4 @@
#define HID_MM_HEADER_12 (HID_BASE + 2279)
#define HID_MM_HEADER_13 (HID_BASE + 2280)
+#define HID_TITLEPAGE (HID_BASE + 2281)
Index: inc/rcid.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/rcid.hrc,v
retrieving revision 1.12
diff -u -r1.12 rcid.hrc
--- openoffice.org.orig/sw/inc/rcid.hrc 22 May 2007 16:20:20 -0000 1.12
+++ openoffice.org/sw/inc/rcid.hrc 10 Jul 2007 12:55:14 -0000
@@ -135,7 +135,7 @@
// globale Ressourcen
#define RC_GLOBALS_BEGIN RC_GLOBALS
-#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 119)
+#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
// Format-Vorlagen
#define RC_FMTUI_BEGIN RC_FMTUI
Index: inc/swabstdlg.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/swabstdlg.hxx,v
retrieving revision 1.13
diff -u -r1.13 swabstdlg.hxx
--- openoffice.org.orig/sw/inc/swabstdlg.hxx 26 Apr 2007 08:48:16 -0000 1.13
+++ openoffice.org/sw/inc/swabstdlg.hxx 10 Jul 2007 12:55:16 -0000
@@ -477,6 +477,7 @@
SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: sdi/_basesh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_basesh.sdi,v
retrieving revision 1.16
diff -u -r1.16 _basesh.sdi
--- openoffice.org.orig/sw/sdi/_basesh.sdi 2 May 2006 15:13:56 -0000 1.16
+++ openoffice.org/sw/sdi/_basesh.sdi 10 Jul 2007 12:55:36 -0000
@@ -250,6 +250,12 @@
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ FN_FORMAT_TITLEPAGE_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
[
ExecMethod = ExecDlg ;
Index: sdi/swriter.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/swriter.sdi,v
retrieving revision 1.66
diff -u -r1.66 swriter.sdi
--- openoffice.org.orig/sw/sdi/swriter.sdi 27 Jun 2007 13:16:04 -0000 1.66
+++ openoffice.org/sw/sdi/swriter.sdi 10 Jul 2007 12:57:02 -0000
@@ -6330,6 +6330,31 @@
]
//--------------------------------------------------------------------------
+SfxVoidItem TitlePageDialog FN_FORMAT_TITLEPAGE_DLG
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Asynchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
SfxVoidItem PageDown FN_PAGEDOWN
()
[
Index: sdi/swslots.src
===================================================================
RCS file: /cvs/sw/sw/sdi/swslots.src,v
retrieving revision 1.131
diff -u -r1.131 swslots.src
--- openoffice.org.orig/sw/sdi/swslots.src 27 Jun 2007 13:16:20 -0000 1.131
+++ openoffice.org/sw/sdi/swslots.src 10 Jul 2007 12:57:02 -0000
@@ -307,6 +307,10 @@
{
Slotname [ en-US ] = "Page Settings";
};
+SfxSlotInfo FN_FORMAT_PAGE_DLG
+{
+ Slotname [ de ] = "~Title Page...";
+};
SfxSlotInfo FN_FORMAT_RESET
{
Slotname [ en-US ] = "Reset Font Attributes";
Index: source/ui/dialog/swdlgfact.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/swdlgfact.cxx,v
retrieving revision 1.13
diff -u -r1.13 swdlgfact.cxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.cxx 26 Apr 2007 09:06:20 -0000 1.13
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.cxx 10 Jul 2007 13:05:50 -0000
@@ -109,6 +109,7 @@
#include <instable.hxx> //add for SwInsTableDlg
#include <javaedit.hxx> //add for SwJavaEditDialog
#include <linenum.hxx> //add for SwLineNumberingDlg
+#include <titlepage.hxx> //add for SwTitlePageDlg
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
#include <mergetbl.hxx> //add for SwMergeTblDlg
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
@@ -1405,6 +1406,14 @@
return 0;
}
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *pParent )
+{
+ Dialog* pDlg = new SwTitlePageDlg( pParent );
+ if ( pDlg )
+ return new VclAbstractDialog_Impl( pDlg );
+ return 0;
+}
+
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Index: source/ui/dialog/swdlgfact.hxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/swdlgfact.hxx,v
retrieving revision 1.9
diff -u -r1.9 swdlgfact.hxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.hxx 26 Apr 2007 09:06:34 -0000 1.9
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.hxx 10 Jul 2007 13:05:50 -0000
@@ -532,6 +532,7 @@
SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: source/ui/inc/swmn_tmpl.hrc
===================================================================
RCS file: /cvs/sw/sw/source/ui/inc/swmn_tmpl.hrc,v
retrieving revision 1.13
diff -u -r1.13 swmn_tmpl.hrc
--- openoffice.org.orig/sw/source/ui/inc/swmn_tmpl.hrc 27 Jun 2007 13:25:09 -0000 1.13
+++ openoffice.org/sw/source/ui/inc/swmn_tmpl.hrc 10 Jul 2007 13:08:19 -0000
@@ -67,8 +67,13 @@
Identifier = FN_FORMAT_PAGE_DLG ; \
HelpID = FN_FORMAT_PAGE_DLG ; \
Text [ en-US ] = "Pa~ge..." ; \
- };
-
+ };\
+ MenuItem\
+ {\
+ Identifier = FN_FORMAT_TITLEPAGE_DLG ; \
+ HelpID = FN_FORMAT_TITLEPAGE_DLG ; \
+ Text [ en-US ] = "~Title Page..." ; \
+ };
#define MN_TEXT_ATTR\
MenuItem\
Index: source/ui/misc/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/makefile.mk,v
retrieving revision 1.12
diff -u -r1.12 makefile.mk
--- openoffice.org.orig/sw/source/ui/misc/makefile.mk 9 Sep 2005 10:35:47 -0000 1.12
+++ openoffice.org/sw/source/ui/misc/makefile.mk 10 Jul 2007 13:09:42 -0000
@@ -60,7 +60,8 @@
pgfnote.src \
pggrid.src \
redlndlg.src \
- srtdlg.src
+ srtdlg.src \
+ titlepage.src
SLOFILES = \
$(SLO)$/bookmark.obj \
@@ -72,6 +73,7 @@
$(SLO)$/insfnote.obj \
$(SLO)$/insrule.obj \
$(SLO)$/linenum.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/num.obj \
$(SLO)$/numberingtypelistbox.obj \
$(SLO)$/outline.obj \
Index: source/ui/shells/basesh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/shells/basesh.cxx,v
retrieving revision 1.81
diff -u -r1.81 basesh.cxx
--- openoffice.org.orig/sw/source/ui/shells/basesh.cxx 10 May 2007 16:22:02 -0000 1.81
+++ openoffice.org/sw/source/ui/shells/basesh.cxx 10 Jul 2007 13:10:07 -0000
@@ -2546,6 +2546,14 @@
switch ( nSlot )
{
+ case FN_FORMAT_TITLEPAGE_DLG:
+ {
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact->CreateTitlePageDlg( pMDI );
+ pDlg->Execute();
+ delete pDlg;
+ }
+ break;
case FN_FORMAT_PAGE_COLUMN_DLG:
case FN_FORMAT_PAGE_DLG:
{
Index: uiconfig/swriter/menubar/menubar.xml
===================================================================
RCS file: /cvs/sw/sw/uiconfig/swriter/menubar/menubar.xml,v
retrieving revision 1.28
diff -u -r1.28 menubar.xml
--- openoffice.org.orig/sw/uiconfig/swriter/menubar/menubar.xml 29 May 2007 14:49:53 -0000 1.28
+++ openoffice.org/sw/uiconfig/swriter/menubar/menubar.xml 10 Jul 2007 13:13:00 -0000
@@ -210,6 +210,7 @@
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:PageDialog"/>
+ <menu:menuitem menu:id=".uno:TitlePageDialog"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:TransliterateMenu">
<menu:menupopup>
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
retrieving revision 1.61
diff -u -r1.61 makefile.mk
--- openoffice.org.orig/sw/util/makefile.mk 22 May 2007 16:41:25 -0000 1.61
+++ openoffice.org/sw/util/makefile.mk 10 Jul 2007 13:13:05 -0000
@@ -263,6 +263,7 @@
$(SLO)$/instable.obj \
$(SLO)$/insrule.obj \
$(SLO)$/javaedit.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/linenum.obj \
$(SLO)$/mailmrge.obj \
$(SLO)$/multmrk.obj \
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/inc/titlepage.hxx 2007-07-10 10:43:39.000000000 +0100
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ ************************************************************************/
+#ifndef _SWTITLEPAGE_HXX
+#define _SWTITLEPAGE_HXX
+
+#ifndef _BASEDLGS_HXX //autogen
+#include <sfx2/basedlgs.hxx>
+#endif
+
+#ifndef _SFXTABDLG_HXX //autogen
+#include <sfx2/tabdlg.hxx>
+#endif
+
+#ifndef _SV_FIXED_HXX //autogen
+#include <vcl/fixed.hxx>
+#endif
+
+#ifndef _SV_FIELD_HXX //autogen
+#include <vcl/field.hxx>
+#endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
+
+#ifndef _LSTBOX_HXX //autogen
+#include <vcl/lstbox.hxx>
+#endif
+
+class Window;
+class SfxItemSet;
+class SwView;
+class SwWrtShell;
+class SwPageDesc;
+
+/*--------------------------------------------------------------------
+ Beschreibung: SingleTabDialog
+ --------------------------------------------------------------------*/
+
+class SwTitlePageDlg : public SfxModalDialog
+{
+private:
+ FixedLine aMakeInsertFL;
+ RadioButton aUseExistingPagesRB;
+ RadioButton aInsertNewPagesRB;
+ FixedText aPageCountFT;
+ NumericField aPageCountNF;
+ FixedText aPagePagesFT;
+
+ FixedLine aNumberingFL;
+ CheckBox aRestartNumberingCB;
+ FixedText aRestartNumberingFT;
+ NumericField aRestartNumberingNF;
+ CheckBox aSetPageNumberCB;
+ FixedText aSetPageNumberFT;
+ NumericField aSetPageNumberNF;
+
+ FixedLine aPagePropertiesFL;
+ ListBox aPagePropertiesLB;
+ PushButton aPagePropertiesPB;
+
+ FixedLine aBottomFL;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
+
+ const SwFmtPageDesc *mpPageFmtDesc;
+
+ SwPageDesc *mpTitleDesc;
+ const SwPageDesc *mpIndexDesc;
+ const SwPageDesc *mpNormalDesc;
+
+ void FillList();
+
+ DECL_LINK( OKHdl, Button * );
+ DECL_LINK( EditHdl, Button * );
+ DECL_LINK( RestartNumberingHdl, CheckBox* );
+ DECL_LINK( SetPageNumberHdl, CheckBox* );
+ DECL_LINK( UpHdl, NumericField * );
+ DECL_LINK( DownHdl, NumericField * );
+public:
+ SwTitlePageDlg( Window *pParent );
+ ~SwTitlePageDlg();
+};
+
+#endif
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.src 2007-07-10 09:58:33.000000000 +0100
@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ ************************************************************************/
+/* StarView ressource file */
+
+#ifndef _SFX_HRC
+#include <sfx2/sfx.hrc>
+#endif
+#ifndef _SVX_DIALOGS_HRC
+#include <svx/dialogs.hrc>
+#endif
+#include "globals.hrc"
+#include "misc.hrc"
+#include "titlepage.hrc"
+#include "helpid.h"
+/**************************************************************************/
+/* */
+/**************************************************************************/
+ModalDialog DLG_TITLEPAGE
+{
+ HelpID = HID_TITLEPAGE ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 216 , 169 ) ;
+ Text [ en-US ] = "Title Pages" ;
+ Moveable = TRUE ;
+
+ FixedLine FL_MAKEINSERT
+ {
+ Pos = MAP_APPFONT ( 6 , 5 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Make Title Pages" ;
+ Text [ x-comment ] = " ";
+ };
+ RadioButton RB_USE_EXISTING_PAGES
+ {
+ Pos = MAP_APPFONT ( 12 , 18 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text [ en-US ] = "Convert existing pages to title pages" ;
+ TabStop = TRUE ;
+ Group = TRUE ;
+ Text [ x-comment ] = " ";
+ };
+ RadioButton RB_INSERT_NEW_PAGES
+ {
+ Pos = MAP_APPFONT ( 12 , 34 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text [ en-US ] = "Insert new title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_PAGE_COUNT
+ {
+ Pos = MAP_APPFONT ( 12 , 50 ) ;
+ Size = MAP_APPFONT ( 80 , 8 ) ;
+ Text [ en-US ] = "Number of title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_PAGE_COUNT
+ {
+ Pos = MAP_APPFONT ( 80 , 50 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ FixedText FT_PAGE_PAGES
+ {
+ Pos = MAP_APPFONT ( 116 , 50 ) ;
+ Size = MAP_APPFONT ( 80 , 10 ) ;
+ Text [ en-US ] = "pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedLine FL_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 6 , 66 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Page Numbering" ;
+ Text [ x-comment ] = " ";
+ };
+ CheckBox CB_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 12, 79 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Reset Page Numbering after title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 140 , 79 ) ;
+ Size = MAP_APPFONT ( 50 , 10 ) ;
+ Text [ en-US ] = "Page Number" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 180 , 79 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ CheckBox CB_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 12 , 93 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Set Page Number for first title page" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 140 , 93 ) ;
+ Size = MAP_APPFONT ( 50 , 10 ) ;
+ Text [ en-US ] = "Page Number" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 180 , 93 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ FixedLine FL_PAGE_PROPERTIES
+ {
+ Pos = MAP_APPFONT ( 6 , 109 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Edit Page Properties" ;
+ Text [ x-comment ] = " ";
+ };
+ ListBox LB_PAGE_PROPERTIES
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 12 , 122 ) ;
+ Size = MAP_APPFONT ( 150 , 80 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ CurPos = 0 ;
+ };
+ PushButton PB_PAGE_PROPERTIES
+ {
+ Pos = MAP_APPFONT ( 170 , 122 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Text [ en-US ] = "Edit..." ;
+ };
+ FixedLine FL_BOTTOM
+ {
+ Pos = MAP_APPFONT ( 6 , 138 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ };
+ OKButton PB_OK
+ {
+ Pos = MAP_APPFONT ( 54 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ DefButton = TRUE ;
+ };
+ CancelButton PB_CANCEL
+ {
+ Pos = MAP_APPFONT ( 107 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ DefButton = TRUE ;
+ };
+ HelpButton PB_HELP
+ {
+ Pos = MAP_APPFONT ( 160 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
+};
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.hrc 2007-07-10 10:00:43.000000000 +0100
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ ************************************************************************/
+#define FL_MAKEINSERT 1
+#define RB_USE_EXISTING_PAGES 2
+#define RB_INSERT_NEW_PAGES 3
+#define FT_PAGE_COUNT 4
+#define NF_PAGE_COUNT 5
+#define FT_PAGE_PAGES 6
+#define FL_NUMBERING 7
+#define CB_RESTART_NUMBERING 8
+#define FT_RESTART_NUMBERING 9
+#define NF_RESTART_NUMBERING 10
+#define CB_SET_PAGE_NUMBER 11
+#define FT_SET_PAGE_NUMBER 12
+#define NF_SET_PAGE_NUMBER 13
+#define FL_PAGE_PROPERTIES 13
+#define LB_PAGE_PROPERTIES 14
+#define PB_PAGE_PROPERTIES 15
+#define FL_BOTTOM 16
+#define PB_OK 17
+#define PB_CANCEL 18
+#define PB_HELP 19
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.cxx 2007-07-10 14:18:25.000000000 +0100
@@ -0,0 +1,368 @@
+/*************************************************************************
+ *
+ * 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_sw.hxx"
+
+#ifdef SW_DLLIMPLEMENTATION
+#undef SW_DLLIMPLEMENTATION
+#endif
+
+#ifndef _SFXVIEWFRM_HXX //autogen
+#include <sfx2/viewfrm.hxx>
+#endif
+
+#ifndef _SFXSTYLE_HXX //autogen
+#include <svtools/style.hxx>
+#endif
+
+#ifndef _SV_MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
+
+#ifndef _SWVIEW_HXX //autogen
+#include <view.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _WRTSH_HXX //autogen
+#include <wrtsh.hxx>
+#endif
+#ifndef _POOLFMT_HXX
+#include <poolfmt.hxx>
+#endif
+#ifndef _SWDOCSH_HXX //autogen
+#include <docsh.hxx>
+#endif
+
+#ifndef _CHARFMT_HXX //autogen
+#include <charfmt.hxx>
+#endif
+
+#ifndef _DOCSTYLE_HXX //autogen
+#include <docstyle.hxx>
+#endif
+
+#include "fldbas.hxx"
+#include "lineinfo.hxx"
+#include "globals.hrc"
+#include "titlepage.hrc"
+#include "titlepage.hxx"
+#include "uitool.hxx"
+#include "fmtpdsc.hxx"
+#include "pagedesc.hxx"
+
+#include <IDocumentStylePoolAccess.hxx>
+
+namespace
+{
+ bool lcl_GetPageDesc(SwWrtShell *pSh, USHORT &rPageNo, const SwFmtPageDesc **ppPageFmtDesc)
+ {
+ bool bRet = false;
+ SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC );
+ if (pSh->GetAttr( aSet ))
+ {
+ const SfxPoolItem* pItem(0);
+ if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, TRUE, &pItem ) && pItem)
+ {
+ rPageNo = ((const SwFmtPageDesc *)pItem)->GetNumOffset();
+ if (ppPageFmtDesc)
+ (*ppPageFmtDesc) = (const SwFmtPageDesc *)(pItem->Clone());
+ bRet = true;
+ }
+ }
+ return bRet;
+ }
+
+ void lcl_ChangePage(SwWrtShell *pSh, USHORT nNoPages, USHORT nNewNumber, const SwPageDesc *pNewDesc)
+ {
+ pSh->SttDoc();
+ FASTBOOL bAllOk = true;
+
+ for (USHORT nI = 0; nI < nNoPages; ++nI)
+ bAllOk = pSh->SttNxtPg();
+
+ if (bAllOk);
+ {
+ const USHORT nCurIdx = pSh->GetCurPageDesc();
+ const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
+
+ const SwFmtPageDesc *pPageFmtDesc(0);
+ USHORT nDontCare;
+ lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
+
+ //If we want a new number then set it, otherwise reuse the existing one
+ USHORT nPgNo = nNewNumber ? nNewNumber : ( pPageFmtDesc ? pPageFmtDesc->GetNumOffset() : 0 );
+
+ //If we want a new descriptior then set it, otherwise reuse the existing one
+ if (!pNewDesc)
+ {
+ SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
+ if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+ else
+ {
+ SwFmtPageDesc aPageFmtDesc(pNewDesc);
+ if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+
+ delete pPageFmtDesc;
+ }
+ }
+
+ void lcl_PushCursor(SwWrtShell *pSh)
+ {
+ pSh->LockView( TRUE );
+ pSh->StartAllAction();
+ pSh->SwCrsrShell::Push();
+ pSh->SttDoc();
+ }
+
+ void lcl_PopCursor(SwWrtShell *pSh)
+ {
+ pSh->SwCrsrShell::Pop( FALSE );
+ pSh->EndAllAction();
+ pSh->LockView( FALSE );
+ }
+}
+
+/*
+ * Only include the Index page in the list if the page count implies one
+ * to reduce confusing things
+ */
+void SwTitlePageDlg::FillList()
+{
+ USHORT nTitlePages = aPageCountNF.GetValue();
+ aPagePropertiesLB.Clear();
+ if (mpTitleDesc)
+ aPagePropertiesLB.InsertEntry(mpTitleDesc->GetName());
+ if (nTitlePages > 1 && mpIndexDesc)
+ aPagePropertiesLB.InsertEntry(mpIndexDesc->GetName());
+ if (mpNormalDesc)
+ aPagePropertiesLB.InsertEntry(mpNormalDesc->GetName());
+ aPagePropertiesLB.SelectEntryPos(0);
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
+ SfxModalDialog( pParent, SW_RES(DLG_TITLEPAGE) ),
+#pragma warning (disable : 4355)
+ aMakeInsertFL ( this, SW_RES( FL_MAKEINSERT )),
+ aUseExistingPagesRB ( this, SW_RES( RB_USE_EXISTING_PAGES )),
+ aInsertNewPagesRB ( this, SW_RES( RB_INSERT_NEW_PAGES )),
+ aPageCountFT ( this, SW_RES( FT_PAGE_COUNT )),
+ aPageCountNF ( this, SW_RES( NF_PAGE_COUNT )),
+ aPagePagesFT ( this, SW_RES( FT_PAGE_PAGES )),
+ aNumberingFL ( this, SW_RES( FL_NUMBERING )),
+ aRestartNumberingCB ( this, SW_RES( CB_RESTART_NUMBERING )),
+ aRestartNumberingFT ( this, SW_RES( FT_RESTART_NUMBERING )),
+ aRestartNumberingNF ( this, SW_RES( NF_RESTART_NUMBERING )),
+ aSetPageNumberCB ( this, SW_RES( CB_SET_PAGE_NUMBER )),
+ aSetPageNumberFT ( this, SW_RES( FT_SET_PAGE_NUMBER )),
+ aSetPageNumberNF ( this, SW_RES( NF_SET_PAGE_NUMBER )),
+ aPagePropertiesFL ( this, SW_RES( FL_PAGE_PROPERTIES )),
+ aPagePropertiesLB ( this, SW_RES( LB_PAGE_PROPERTIES )),
+ aPagePropertiesPB ( this, SW_RES( PB_PAGE_PROPERTIES )),
+ aBottomFL ( this, SW_RES( FL_BOTTOM )),
+ aOkPB ( this, SW_RES( PB_OK )),
+ aCancelPB ( this, SW_RES( PB_CANCEL )),
+ aHelpPB ( this, SW_RES( PB_HELP )),
+ mpPageFmtDesc (0)
+#pragma warning (default : 4355)
+{
+ FreeResource();
+
+ aOkPB.SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
+ aRestartNumberingCB.SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
+ aSetPageNumberCB.SetClickHdl(LINK(this, SwTitlePageDlg, SetPageNumberHdl));
+
+ USHORT nSetPage = 1;
+ USHORT nResetPage = 1;
+ USHORT nTitlePages = 1;
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ lcl_PushCursor(pSh);
+
+ SwView& rView = pSh->GetView();
+ rView.InvalidateRulerPos();
+
+ bool bMaybeResetNumbering = false;
+
+ mpTitleDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_FIRST);
+ mpIndexDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_REGISTER);
+ mpNormalDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
+
+ if (lcl_GetPageDesc( pSh, nSetPage, &mpPageFmtDesc ))
+ {
+ if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
+ {
+ while (pSh->SttNxtPg())
+ {
+ const USHORT nCurIdx = pSh->GetCurPageDesc();
+ const SwPageDesc &rPageDesc = pSh->GetPageDesc( nCurIdx );
+
+ if (mpIndexDesc != &rPageDesc)
+ {
+ mpNormalDesc = &rPageDesc;
+ bMaybeResetNumbering = lcl_GetPageDesc(pSh, nResetPage, NULL);
+ break;
+ }
+ ++nTitlePages;
+ }
+ pSh->SttDoc();
+ }
+ }
+ lcl_PopCursor(pSh);
+
+ aUseExistingPagesRB.Check();
+ aPageCountNF.SetValue(nTitlePages);
+ aPageCountNF.SetUpHdl(LINK(this, SwTitlePageDlg, UpHdl));
+ aPageCountNF.SetDownHdl(LINK(this, SwTitlePageDlg, DownHdl));
+
+ if (bMaybeResetNumbering && nResetPage > 0)
+ {
+ aRestartNumberingCB.Check();
+ aRestartNumberingNF.SetValue(nResetPage);
+ }
+ aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
+
+ aSetPageNumberNF.SetValue(nSetPage);
+ if (nSetPage > 1)
+ aSetPageNumberCB.Check();
+ aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
+
+ FillList();
+ aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl));
+}
+
+IMPL_LINK(SwTitlePageDlg, UpHdl, NumericField *, EMPTYARG)
+{
+ if (aPageCountNF.GetValue() == 2)
+ FillList();
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, DownHdl, NumericField *, EMPTYARG)
+{
+ if (aPageCountNF.GetValue() == 1)
+ FillList();
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, RestartNumberingHdl, CheckBox*, EMPTYARG)
+{
+ aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, SetPageNumberHdl, CheckBox*, EMPTYARG)
+{
+ aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
+ return 0;
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+__EXPORT SwTitlePageDlg::~SwTitlePageDlg()
+{
+ delete mpPageFmtDesc;
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SwTitlePageDlg, EditHdl, Button *, pBtn )
+{
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ SwView& rView = pSh->GetView();
+ rView.GetDocShell()->FormatPage(aPagePropertiesLB.GetSelectEntry(), false, pSh);
+ rView.InvalidateRulerPos();
+
+ return 0;
+}
+
+IMPL_LINK( SwTitlePageDlg, OKHdl, Button *, pBtn )
+{
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ lcl_PushCursor(pSh);
+ pSh->StartUndo();
+
+ SwFmtPageDesc aTitleDesc(mpTitleDesc);
+
+ if (aSetPageNumberCB.IsChecked())
+ aTitleDesc.SetNumOffset(aSetPageNumberNF.GetValue());
+ else if (mpPageFmtDesc)
+ aTitleDesc.SetNumOffset(mpPageFmtDesc->GetNumOffset());
+
+ USHORT nNoPages = aPageCountNF.GetValue();
+ if (!aUseExistingPagesRB.IsChecked())
+ {
+ for (USHORT nI=0; nI < nNoPages; ++nI)
+ pSh->InsertPageBreak();
+ }
+ for (USHORT nI=1; nI < nNoPages; ++nI)
+ lcl_ChangePage(pSh, nI, 0, mpIndexDesc);
+
+ pSh->SttDoc();
+ pSh->SetAttr(aTitleDesc);
+
+ if (nNoPages > 1 && pSh->GotoPage(nNoPages, false))
+ {
+ SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+
+ if (aRestartNumberingCB.IsChecked() || nNoPages > 1)
+ {
+ USHORT nPgNo = aRestartNumberingCB.IsChecked() ? aRestartNumberingNF.GetValue() : 0;
+ const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : 0;
+ lcl_ChangePage(pSh, nNoPages, nPgNo, pNewDesc);
+ }
+
+ pSh->EndUndo();
+ lcl_PopCursor(pSh);
+ if (!aUseExistingPagesRB.IsChecked())
+ pSh->SttDoc();
+ EndDialog( RET_OK );
+ return 0;
+}
diff -ru openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 2007-07-10 14:35:38.000000000 +0100
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 2007-07-09 12:03:44.000000000 +0100
@@ -802,6 +802,11 @@
<value xml:lang="en-US">~Page...</value>
</prop>
</node>
+ <node oor:name=".uno:TitlePageDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Title Page...</value>
+ </prop>
+ </node>
<node oor:name=".uno:FormatColumns" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Co~lumns...</value>
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77885.stoc.stocmerge.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(
[...4607 lines suppressed...]
-#
-# $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.2.0.4.ooo80412.i18npool.extendgrapheme.patch:
--- NEW FILE openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch ---
--- /dev/null 2006-10-27 08:30:37.620506410 +0100
+++ OOD680_m4/i18npool/source/breakiterator/data/char.txt 2006-10-31 16:33:17.000000000 +0000
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2002-2006, International Business Machines Corporation and others.
+# All Rights Reserved.
+#
+# file: char.txt
+#
+# ICU Character Break Rules, also known as Grapheme Cluster Boundaries
+# See Unicode Standard Annex #29.
+# These rules are based on TR29 Version 5.0.0
+# Includes post-5.0 change to treat Japanese half width voicing marks
+# as Grapheme Extend.
+#
+
+#
+# Character Class Definitions.
+#
+$CR = [\p{Grapheme_Cluster_Break = CR}];
+$LF = [\p{Grapheme_Cluster_Break = LF}];
+$Control = [\p{Grapheme_Cluster_Break = Control}];
+
+# add Japanese Half Width voicing marks to $Extend
+$VoiceMarks = [\uff9e\uff9f];
+$cmcextend = [\u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0c01-\u0c03 \u0c41-\u0c44];
+$Extend = [\p{Grapheme_Cluster_Break = Extend} $VoiceMarks $cmcextend];
+
+#
+# Korean Syllable Definitions
+#
+$L = [\p{Grapheme_Cluster_Break = L}];
+$V = [\p{Grapheme_Cluster_Break = V}];
+$T = [\p{Grapheme_Cluster_Break = T}];
+
+$LV = [\p{Grapheme_Cluster_Break = LV}];
+$LVT = [\p{Grapheme_Cluster_Break = LVT}];
+
+$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
+
+## -------------------------------------------------
+
+!!forward;
+
+$CR $LF;
+([^$Control $CR $LF] | $HangulSyllable) $Extend*;
+
+## -------------------------------------------------
+
+!!reverse;
+
+$BackHangulSyllable = $L+ | ($T* ($V+$LV? | $LV | $LVT) $L*) | $T+;
+$BackOneCluster = ($LF $CR) | ($Extend* ([^$Control $CR $LF] | $BackHangulSyllable));
+$BackOneCluster;
+
+## -------------------------------------------------
+
+!!safe_reverse;
+
+# rule 6, 7, 8
+$V+ $L;
+
+## -------------------------------------------------
+
+!!safe_forward;
+
+# rule 6, 7, 8
+$V+ $T;
--- ooobuild.VBAObjects.patch DELETED ---
--- openoffice.org-1.9.115.ooo51931.fixxmlsec.patch DELETED ---
--- openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch DELETED ---
--- openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch DELETED ---
--- openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch DELETED ---
--- openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch DELETED ---
--- openoffice.org-1.9.97.rh156067.noversionedsysui.patch DELETED ---
--- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch DELETED ---
--- openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch DELETED ---
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch DELETED ---
--- openoffice.org-2.0.3.rh187919.gtkunderkde.patch DELETED ---
--- openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch DELETED ---
--- openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch DELETED ---
--- openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch DELETED ---
--- openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch DELETED ---
--- openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch DELETED ---
--- openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch DELETED ---
--- openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch DELETED ---
--- openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch DELETED ---
--- openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch DELETED ---
--- openoffice.org-2.2.0.ooo74401.basctl.boost.patch DELETED ---
--- openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch DELETED ---
--- openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch DELETED ---
--- openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch DELETED ---
--- openoffice.org-2.2.0.ooo75329.xdguserdir.patch DELETED ---
--- openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch DELETED ---
--- openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch DELETED ---
--- openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch DELETED ---
--- openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch DELETED ---
--- openoffice.org-2.2.1.ooo77214.rtfprtdata.sw.patch DELETED ---
--- openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch DELETED ---
--- openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch DELETED ---
--- openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch DELETED ---
--- openoffice.org-2.2.1.ooo78921.sw.embedded.patch DELETED ---
--- openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch DELETED ---
--- openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch DELETED ---
--- openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch DELETED ---
--- openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch DELETED ---
--- openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch DELETED ---
--- openoffice.org.ooo79953.dbusinhibitscreensaver.patch DELETED ---
--- workspace.cmcfixes34.patch DELETED ---
--- workspace.glyphadv.patch DELETED ---
--- workspace.libxslt02.patch DELETED ---
--- workspace.ppc64one.patch DELETED ---
--- workspace.sixtyfour11.patch DELETED ---
--- workspace.thbpp6.patch DELETED ---
--- workspace.tipatch8.patch DELETED ---
- Previous message (by thread): rpms/squirrelmail/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 squirrelmail.spec, 1.54, 1.55
- Next message (by thread): rpms/dirac/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 dirac.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list