rpms/openoffice.org/FC-4 openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, NONE, 1.1 openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch, NONE, 1.1 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.5, 1.6 openoffice.org.spec, 1.233, 1.234

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jan 4 09:48:45 UTC 2006 

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17283

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 
	openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch 
Log Message:
use a different set of default bullets for writer

openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch:
 desktop/menus/writer.desktop       |    0 
 sysui/desktop/menus/writer.desktop |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch ---
Index: desktop/menus/writer.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/writer.desktop,v
retrieving revision 1.9
diff -u -r1.9 writer.desktop
--- openoffice.org.orig/sysui/desktop/menus/writer.desktop	20 Apr 2005 11:35:35 -0000	1.9
+++ openoffice.org/sysui/desktop/menus/writer.desktop	22 Dec 2005 13:22:19 -0000
@@ -7,6 +7,6 @@
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -writer %U
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
 Name=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.

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/FC-4/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch	21 Dec 2005 19:44:23 -0000	1.5
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch	4 Jan 2006 09:48:41 -0000	1.6
@@ -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/FC-4/openoffice.org.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- openoffice.org.spec	21 Dec 2005 17:26:30 -0000	1.233
+++ openoffice.org.spec	4 Jan 2006 09:48:41 -0000	1.234
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 2
+%define rh_rpm_release 4
 
 %define build_fc5 0
 %define build_fc4 1
@@ -213,6 +213,8 @@
 Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
 Patch48: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch
 Patch49: openoffice.org-2.0.1.oooXXXXX.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 +882,8 @@
 %patch48 -p1 -b .oooXXXXX.config_office.nss.patch
 %endif
 %patch49 -p1 -b .oooXXXXX.vcl.animatedtheme.patch
+%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3338,6 +3342,10 @@
 %{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#
+- add openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch for rh#176259#
+
 * Wed Dec 21 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-2
 - 2.0.1
 - add openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch for animated

More information about the fedora-cvs-commits mailing list