rpms/openoffice.org/devel openoffice.org-1.9.118.forwarddecl.psprint.patch, NONE, 1.1 openoffice.org.spec, 1.320, 1.321

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.118.forwarddecl.psprint.patch 
Log Message:
still unapplied forward decl fixes

openoffice.org-1.9.118.forwarddecl.psprint.patch:
 inc/psprint/fontmanager.hxx         |    0 
 inc/psprint/printergfx.hxx          |    0 
 psprint/inc/psprint/fontmanager.hxx |   17 ++++++++++++-----
 psprint/inc/psprint/printergfx.hxx  |    2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.118.forwarddecl.psprint.patch ---
Index: inc/psprint/fontmanager.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
retrieving revision 1.22
diff -u -p -r1.22 fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	31 Jan 2005 08:58:54 -0000	1.22
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	17 Jun 2005 12:36:09 -0000
@@ -246,17 +246,24 @@ struct KernPair
 // a class to manage printable fonts
 // aims are type1 and truetype fonts
 
+
+class PrintFont;
+class TrueTypeFontFile;
+class Type1FontFile;
+class BuiltinFont;
+class FontCache;
+
 class PrintFontManager
 {
     struct PrintFont;
     struct TrueTypeFontFile;
     struct Type1FontFile;
     struct BuiltinFont;
-    friend class PrintFont;
-    friend class TrueTypeFontFile;
-    friend class Type1FontFile;
-    friend class BuiltinFont;
-    friend class FontCache;
+    friend class PrintFont;
+    friend class TrueTypeFontFile;
+    friend class Type1FontFile;
+    friend class BuiltinFont;
+    friend class FontCache;
 
     struct PrintFontMetrics
     {
Index: inc/psprint/printergfx.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/printergfx.hxx,v
retrieving revision 1.14
diff -u -p -r1.14 printergfx.hxx
--- openoffice.org.orig/psprint/inc/psprint/printergfx.hxx	8 Sep 2004 14:00:04 -0000	1.14
+++ openoffice.org/psprint/inc/psprint/printergfx.hxx	17 Jun 2005 19:18:59 -0000
@@ -218,6 +218,8 @@ struct GraphicsStatus
     GraphicsStatus();
 };
 
+class Font3;
+
 class PrinterGfx
 {
 private:            


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- openoffice.org.spec	16 Jul 2005 16:46:24 -0000	1.320
+++ openoffice.org.spec	17 Jul 2005 17:04:03 -0000	1.321
@@ -162,6 +162,7 @@
 Patch61: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
 Patch62: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 Patch63: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
+Patch64: openoffice.org-1.9.118.forwarddecl.psprint.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -810,6 +811,7 @@
 %patch62 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
 %endif
 %patch63 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
+%patch64 -p1 -b .forwarddecl.psprint.patch
 
 %if %{includeexternals}
 #start ludicrous workaround