rpms/openoffice.org/devel openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch, NONE, 1.1 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.3, 1.4 openoffice.org.spec, 1.600, 1.601
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 3 17:23:56 UTC 2006
- Previous message (by thread): rpms/selinux-policy/devel policy-20051208.patch, 1.34, 1.35 selinux-policy.spec, 1.70, 1.71
- Next message (by thread): rpms/util-linux/devel util-linux-2.12p-cal-wide.patch, NONE, 1.1 util-linux-2.12p-col-EILSEQ.patch, NONE, 1.1 util-linux-2.13-mount-twiceloop.patch, NONE, 1.1 util-linux-2.13-audit-hwclock.patch, 1.3, 1.4 util-linux.spec, 1.101, 1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1951
Modified Files:
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org.spec
Added Files:
openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
Log Message:
rh#176779# / ooo#59997# default writer bullets changed, but one not in opensymbol
openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch:
source/core/doc/number.cxx | 0
sw/source/core/doc/number.cxx | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch ---
Index: source/core/doc/number.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v
retrieving revision 1.32
diff -u -p -u -r1.32 number.cxx
--- openoffice.org.orig/sw/source/core/doc/number.cxx 8 Nov 2005 17:17:38 -0000 1.32
+++ openoffice.org/sw/source/core/doc/number.cxx 3 Jan 2006 17:19:09 -0000
@@ -986,8 +986,8 @@ void SwNumRule::Indent(short nAmount, in
sal_Unicode GetBulletChar(BYTE nLevel)
{
static sal_Unicode nLevelChars[MAXLEVEL] =
- { 0x25cf, 0x25cb, 0x25a0, 0x25cf, 0x25cb,
- 0x25a0, 0x25cf, 0x25cb, 0x25a0, 0x25cf };
+ { 0x25cf, 0xe572, 0x25a0, 0x25cf, 0xe572,
+ 0x25a0, 0x25cf, 0xe572, 0x25a0, 0x25cf };
if (nLevel > MAXLEVEL)
nLevel = MAXLEVEL;
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
fontmanager/fontcache.cxx | 2
fontmanager/fontmanager.cxx | 9
inc/psprint/fontmanager.hxx | 0
psprint/fontmanager.hxx | 13 -
psprint/source/fontmanager/fontconfig.cxx | 269 ++++++++++++++++++-----
source/fontmanager/fontcache.cxx | 0
source/fontmanager/fontconfig.cxx | 0
source/fontmanager/fontmanager.cxx | 0
vcl/inc/outdev.h | 3
vcl/inc/outfont.hxx | 15 +
vcl/source/gdi/outdev3.cxx | 338 +++++++++++++++++++++---------
vcl/source/window/window.cxx | 5
vcl/util/makefile.mk | 2
13 files changed, 487 insertions(+), 169 deletions(-)
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 9 Nov 2005 09:58:21 -0000 1.3
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 3 Jan 2006 17:23:53 -0000 1.4
@@ -365,7 +365,7 @@
- fprintf( stderr, "GlyphFallbackFont[%d] (quality=%05d): \"%s\"\n",
- i, pFont->GetMinQuality(), aFontName.GetBuffer() );
+ ByteString l( aSelData.maSearchName, RTL_TEXTENCODING_UTF8 );
-+ fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer());
++ //fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer());
}
-#endif
-
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- openoffice.org.spec 23 Dec 2005 10:47:35 -0000 1.600
+++ openoffice.org.spec 3 Jan 2006 17:23:53 -0000 1.601
@@ -1,6 +1,6 @@
%define oootag OOA680
%define ooomilestone 1
-%define rh_rpm_release 3
+%define rh_rpm_release 4
%define build_fc5 1
%define build_fc4 0
@@ -214,6 +214,7 @@
Patch48: openoffice.org-2.0.1.ooo59537.config_office.nss.patch
Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch
Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -880,6 +881,7 @@
%patch48 -p1 -b .ooo59537.config_office.nss.patch
%patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch
%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3338,6 +3340,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-4
+- add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779#
+
* Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-3
- gcc#25426# fixed
+ reenabled workspace.jaxpapi.patch
- Previous message (by thread): rpms/selinux-policy/devel policy-20051208.patch, 1.34, 1.35 selinux-policy.spec, 1.70, 1.71
- Next message (by thread): rpms/util-linux/devel util-linux-2.12p-cal-wide.patch, NONE, 1.1 util-linux-2.12p-col-EILSEQ.patch, NONE, 1.1 util-linux-2.13-mount-twiceloop.patch, NONE, 1.1 util-linux-2.13-audit-hwclock.patch, 1.3, 1.4 util-linux.spec, 1.101, 1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list