rpms/openoffice.org/devel workspace.vcl94.patch, NONE, 1.1 openoffice.org.spec, 1.1657, 1.1658 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch, 1.2, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10304

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl94.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 
Log Message:
use upstream workspace name

workspace.vcl94.patch:

--- NEW FILE workspace.vcl94.patch ---
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.30.20.1
diff -u -r1.30.20.1 fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	10 Sep 2008 13:53:12 -0000	1.30.20.1
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	19 Sep 2008 11:32:56 -0000
@@ -91,7 +91,6 @@
 class FontCfgWrapper
 {
     oslModule		m_pLib;
-    FcConfig*		m_pDefConfig;
     FcFontSet*      m_pOutlineSet;
 
     FcBool          (*m_pFcInit)();
@@ -141,7 +140,6 @@
     bool isValid() const 
     { return m_pLib != NULL;}
 
-    FcConfig* getDefConfig() { return m_pDefConfig; }
     FcFontSet* getFontSet();
     
     FcBool FcInit()
@@ -257,7 +255,6 @@
 
 FontCfgWrapper::FontCfgWrapper()
         : m_pLib( NULL ),
-          m_pDefConfig( NULL ),
           m_pOutlineSet( NULL )
 {
      OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
@@ -387,8 +384,7 @@
 
 
     FcInit();
-    m_pDefConfig = FcConfigGetCurrent();
-    if( ! m_pDefConfig )
+    if( ! FcConfigGetCurrent() )
     {
         osl_unloadModule( (oslModule)m_pLib );
         m_pLib = NULL;
@@ -402,7 +398,7 @@
       add only acceptable outlined fonts to our config, 
       for future fontconfig use
     */
-    FcFontSet* pOrig = FcConfigGetFonts( getDefConfig(), eSetName );
+    FcFontSet* pOrig = FcConfigGetFonts( FcConfigGetCurrent(), eSetName );
     if( !pOrig )
         return;
 
@@ -820,7 +816,7 @@
     if( nVersion <= 20400 )
         return false;
     const char* pDirName = (const char*)rDirName.getStr();
-    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.getDefConfig(), (FcChar8*)pDirName ) == FcTrue);
+    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue);
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
@@ -940,13 +936,13 @@
     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
 
     // query fontconfig for a substitute
-    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
+    rWrapper.FcConfigSubstitute( rWrapper.FcConfigGetCurrent(), pPattern, FcMatchPattern );
     rWrapper.FcDefaultSubstitute( pPattern );
 
     // process the result of the fontconfig query
     FcResult eResult = FcResultNoMatch;
     FcFontSet* pFontSet = rWrapper.getFontSet();
-    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.getDefConfig(), &pFontSet, 1, pPattern, &eResult );
+    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.FcConfigGetCurrent(), &pFontSet, 1, pPattern, &eResult );
     rWrapper.FcPatternDestroy( pPattern );
 
     FcFontSet*  pSet = NULL;
@@ -1091,7 +1087,7 @@
     if( ! rWrapper.isValid() )
         return false;
 
-    FcConfig* pConfig = rWrapper.getDefConfig();
+    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
     FcPattern* pPattern = rWrapper.FcPatternCreate();
 
     OString aLangAttrib;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1657
retrieving revision 1.1658
diff -u -r1.1657 -r1.1658
--- openoffice.org.spec	22 Sep 2008 06:57:58 -0000	1.1657
+++ openoffice.org.spec	24 Sep 2008 07:39:55 -0000	1.1658
@@ -114,7 +114,7 @@
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
-Patch46: openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
+Patch46: workspace.vcl94.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1314,7 +1314,7 @@
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
-%patch46 -p1 -b .ooo94069.psprint.defconfig.patch
+%patch46 -p1 -b .workspace.vcl94.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch DELETED ---