rpms/openoffice.org/devel openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch, 1.1, 1.2
Caolan McNamara
caolanm at fedoraproject.org
Mon Sep 22 08:24:43 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28462
Modified Files:
openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
Log Message:
defuzz
openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch:
Index: openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 19 Sep 2008 11:44:59 -0000 1.1
+++ openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 22 Sep 2008 08:24:12 -0000 1.2
@@ -13,7 +13,7 @@
FcFontSet* m_pOutlineSet;
FcBool (*m_pFcInit)();
-@@ -140,7 +139,6 @@
+@@ -141,7 +140,6 @@
bool isValid() const
{ return m_pLib != NULL;}
@@ -21,7 +21,7 @@
FcFontSet* getFontSet();
FcBool FcInit()
-@@ -252,7 +250,6 @@
+@@ -257,7 +255,6 @@
FontCfgWrapper::FontCfgWrapper()
: m_pLib( NULL ),
@@ -29,7 +29,7 @@
m_pOutlineSet( NULL )
{
OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
-@@ -379,8 +376,7 @@
+@@ -387,8 +384,7 @@
FcInit();
@@ -39,7 +39,7 @@
{
osl_unloadModule( (oslModule)m_pLib );
m_pLib = NULL;
-@@ -394,7 +390,7 @@
+@@ -402,7 +398,7 @@
add only acceptable outlined fonts to our config,
for future fontconfig use
*/
@@ -48,7 +48,7 @@
if( !pOrig )
return;
-@@ -794,7 +790,7 @@
+@@ -820,7 +816,7 @@
if( nVersion <= 20400 )
return false;
const char* pDirName = (const char*)rDirName.getStr();
@@ -57,8 +57,8 @@
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
-@@ -914,13 +910,13 @@
- addtopattern(rWrapper, pPattern, eItalic, eWeight, eWidth, ePitch);
+@@ -940,13 +936,13 @@
+ addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
// query fontconfig for a substitute
- rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
@@ -73,7 +73,7 @@
rWrapper.FcPatternDestroy( pPattern );
FcFontSet* pSet = NULL;
-@@ -982,7 +978,7 @@
+@@ -1091,7 +1087,7 @@
if( ! rWrapper.isValid() )
return false;
More information about the fedora-extras-commits
mailing list