Thu Jul 24 11:00:16 UTC 2008

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9096

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	workspace.cmcfixes46.patch 
Removed Files:
	openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch 
	openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch 
	openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch 
	openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch 
	openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch 
	workspace.native172.patch 
Log Message:
next version

workspace.cmcfixes46.patch:

--- NEW FILE workspace.cmcfixes46.patch ---
Index: unx/source/gdi/salgdi3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
retrieving revision 1.154
diff -u -r1.154 salgdi3.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx	11 Apr 2008 09:55:12 -0000	1.154
+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx	3 Jun 2008 15:52:06 -0000
@@ -944,7 +950,7 @@
     Display* pDisplay = GetXDisplay();
 
     cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
-        hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1);
+        hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
 
     /*
      * It might be ideal to cache surface and cairo context between calls and
Index: inc/tools/resmgr.hxx
===================================================================
RCS file: /cvs/util/tools/inc/tools/resmgr.hxx,v
retrieving revision 1.5
diff -u -r1.5 resmgr.hxx
--- openoffice.org.orig/tools/inc/tools/resmgr.hxx	11 Apr 2008 13:28:38 -0000	1.5
+++ openoffice.org/tools/inc/tools/resmgr.hxx	3 Jun 2008 15:26:03 -0000
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 
 #define CREATEVERSIONRESMGR_NAME( Name )   #Name
-#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( #Name )
+#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( Name ) )
 
 #define LOCALE_MAX_FALLBACK 6
 
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.240
diff -u -r1.240 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	11 Apr 2008 08:49:58 -0000	1.240
+++ openoffice.org/vcl/source/gdi/outdev3.cxx	4 May 2008 16:43:14 -0000
@@ -2786,6 +2786,17 @@
     if( rA.maStyleName != rB.maStyleName)
         return false;
 
+    // Symbol fonts may recode from one type to another So they are only
+    // safely equivalent for equal targets
+    if (
+        (rA.mpFontData && rA.mpFontData->IsSymbolFont()) ||
+        (rB.mpFontData && rB.mpFontData->IsSymbolFont())
+       )
+    {
+        if (rA.maTargetName != rB.maTargetName)
+            return false;
+    }
+
     return true;
 }
 
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.149
diff -u -r1.149 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	11 Apr 2008 08:57:28 -0000	1.149
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	4 May 2008 16:43:33 -0000
@@ -911,11 +914,21 @@
 void FreetypeServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
 {
     static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes();
+
     rTo.mbScalableFont  = true;
     rTo.mbDevice        = true;
     rTo.mbKernableFont  = (FT_HAS_KERNING( maFaceFT ) != 0) || mpFontInfo->HasExtraKerning();
     rTo.mnOrientation = GetFontSelData().mnOrientation;
 
+    //Always consider [star]symbol as symbol fonts
+    if (
+         (rTo.GetFamilyName().EqualsAscii("OpenSymbol")) ||
+         (rTo.GetFamilyName().EqualsAscii("StarSymbol"))
+       )
+    {
+        rTo.mbSymbolFlag = true;
+    }
+
     if( maSizeFT )
         pFTActivateSize( maSizeFT );
 
diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2008-05-26 15:17:03.000000000 +0100
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2008-06-03 13:01:17.000000000 +0100
@@ -2172,7 +2242,7 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    FT_Int nLoadFlags = FT_LOAD_DEFAULT;
+    FT_Int nLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM;
 
 #ifdef FT_LOAD_TARGET_LIGHT
     // enable "light hinting" if available


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- .cvsignore	21 Jul 2008 13:10:14 -0000	1.178
+++ .cvsignore	24 Jul 2008 10:59:31 -0000	1.179
@@ -6,4 +6,3 @@
 redhat-langpacks.tar.gz
 evolocal.odb
 bengali.sdf
-DEV300_m26.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1591
retrieving revision 1.1592
diff -u -r1.1591 -r1.1592
--- openoffice.org.spec	23 Jul 2008 22:55:52 -0000	1.1591
+++ openoffice.org.spec	24 Jul 2008 10:59:31 -0000	1.1592
@@ -1,6 +1,6 @@
 %define oootag DEV300
-%define ooomilestone 26
-%define rh_rpm_release 2
+%define ooomilestone 27
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -101,20 +101,15 @@
 Patch29: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 Patch30: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
 Patch31: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch32: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch33: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch34: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch35: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch36: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch37: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch38: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch39: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch40: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch41: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
-Patch42: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch43: workspace.native172.patch
-Patch44: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
-Patch45: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch32: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch33: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch34: workspace.cmcfixes46.patch
+Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch37: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
+Patch38: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch39: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch40: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1260,20 +1255,15 @@
 %patch29 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 %patch30 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
 %patch31 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch32 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch33 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch34 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch35 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch36 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch37 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch38 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch39 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch40 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch41 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
-%patch42 -p1 -b .ooo86142.serbiannumbering.patch
-%patch43 -p1 -b .workspace.native172.patch
-%patch44 -p1 -b .ooo91977.sd.holdreference.patch
-%patch45 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch32 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch33 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch34 -p1 -b .workspace.cmcfixes46.patch
+%patch35 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch36 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch37 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
+%patch38 -p1 -b .ooo86142.serbiannumbering.patch
+%patch39 -p1 -b .ooo91977.sd.holdreference.patch
+%patch40 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2820,7 +2810,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
-%{_datadir}/mimelnk/application/*database*
 
 %files base
 %defattr(-,root,root,-)
@@ -2828,6 +2817,7 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/sbase
 %{_datadir}/applications/openoffice.org-*-base.desktop
+%{_datadir}/mimelnk/application/openoffice.org-*database*
 %{_bindir}/oobase
 
 %post base
@@ -2842,6 +2832,7 @@
 %dir %{brinstdir}/program
 %{brinstdir}/program/sbase
 %{_datadir}/applications/broffice.org-base.desktop
+%{_datadir}/mimelnk/application/broffice.org-*database*
 
 %post -n broffice.org-base
 update-desktop-database -q %{_datadir}/applications
@@ -3048,7 +3039,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
-%{_datadir}/mimelnk/application/*spreadsheet*
 #vba
 %{basisinstdir}/program/libvbaobj%{SOPOST}.uno.so
 
@@ -3060,6 +3050,7 @@
 %{oooinstdir}/program/scalc.bin
 %{_datadir}/applications/openoffice.org-*-calc.desktop
 %{_datadir}/mimelnk/application/openoffice.org-ms-excel*
+%{_datadir}/mimelnk/application/openoffice.org-*spreadsheet*
 %{_bindir}/oocalc
 
 %post calc
@@ -3076,6 +3067,7 @@
 %{brinstdir}/program/scalc.bin
 %{_datadir}/applications/broffice.org-calc.desktop
 %{_datadir}/mimelnk/application/broffice.org-ms-excel*
+%{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
 
 %post -n broffice.org-calc
 update-desktop-database -q %{_datadir}/applications
@@ -3118,7 +3110,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
-%{_datadir}/mimelnk/application/*drawing*
 
 %files draw
 %defattr(-,root,root,-)
@@ -3127,6 +3118,7 @@
 %{oooinstdir}/program/sdraw
 %{oooinstdir}/program/sdraw.bin
 %{_datadir}/applications/openoffice.org-*-draw.desktop
+%{_datadir}/mimelnk/application/openoffice.org-*drawing*
 %{_bindir}/oodraw
 
 %post draw
@@ -3142,6 +3134,7 @@
 %{brinstdir}/program/sdraw
 %{brinstdir}/program/sdraw.bin
 %{_datadir}/applications/broffice.org-draw.desktop
+%{_datadir}/mimelnk/application/broffice.org-*drawing*
 
 %post -n broffice.org-draw
 update-desktop-database -q %{_datadir}/applications
@@ -3227,9 +3220,6 @@
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
-%{_datadir}/mimelnk/application/*master*
-%{_datadir}/mimelnk/application/*text*
-%{_datadir}/mimelnk/application/*web*
 
 %files writer
 %defattr(-,root,root,-)
@@ -3240,6 +3230,9 @@
 %{_datadir}/applications/openoffice.org-*-writer.desktop
 %{_datadir}/mimelnk/application/openoffice.org-ms-word*
 %{_datadir}/mimelnk/application/openoffice.org-openxmlformats-officedocument-wordprocessingml*
+%{_datadir}/mimelnk/application/openoffice.org-*master*
+%{_datadir}/mimelnk/application/openoffice.org-*text*
+%{_datadir}/mimelnk/application/openoffice.org-*web*
 %{_bindir}/oowriter
 
 %post writer
@@ -3255,6 +3248,9 @@
 %{_datadir}/applications/broffice.org-writer.desktop
 %{_datadir}/mimelnk/application/broffice.org-ms-word*
 %{_datadir}/mimelnk/application/broffice.org-openxmlformats-officedocument-wordprocessingml*
+%{_datadir}/mimelnk/application/broffice.org-*master*
+%{_datadir}/mimelnk/application/broffice.org-*text*
+%{_datadir}/mimelnk/application/broffice.org-*web*
 
 %post -n broffice.org-writer
 update-desktop-database -q %{_datadir}/applications
@@ -3304,7 +3300,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
-%{_datadir}/mimelnk/application/*presentation*
 
 %files impress
 %defattr(-,root,root,-)
@@ -3314,6 +3309,7 @@
 %{oooinstdir}/program/simpress.bin
 %{_datadir}/applications/openoffice.org-*-impress.desktop
 %{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint*
+%{_datadir}/mimelnk/application/openoffice.org-*presentation*
 %{_bindir}/ooimpress
 
 %post impress
@@ -3330,6 +3326,7 @@
 %{brinstdir}/program/simpress.bin
 %{_datadir}/applications/broffice.org-impress.desktop
 %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint*
+%{_datadir}/mimelnk/application/broffice.org-*presentation*
 
 %post -n broffice.org-impress
 update-desktop-database -q %{_datadir}/applications
@@ -3381,7 +3378,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
-%{_datadir}/mimelnk/application/*formula*
 
 %files math
 %defattr(-,root,root,-)
@@ -3389,6 +3385,7 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/smath
 %{_datadir}/applications/openoffice.org-*-math.desktop
+%{_datadir}/mimelnk/application/openoffice.org-*formula*
 %{_bindir}/oomath
 
 %post math
@@ -3403,6 +3400,7 @@
 %dir %{brinstdir}/program
 %{brinstdir}/program/smath
 %{_datadir}/applications/broffice.org-math.desktop
+%{_datadir}/mimelnk/application/broffice.org-*formula*
 
 %post -n broffice.org-math
 update-desktop-database -q %{_datadir}/applications
@@ -3574,10 +3572,15 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.27-1
+- next version
+- drop integrated workspace.native172.patch
+- drop integrated openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+
 * Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 - Resolves: rhbz#451708 ensure root certs are available for document signing
-- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk
+- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk again
 
 * Tue Jul 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
 - next version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- sources	21 Jul 2008 15:34:03 -0000	1.305
+++ sources	24 Jul 2008 10:59:31 -0000	1.306
@@ -6,4 +6,3 @@
 261ff401db54526e1f5cf7bbe5f2adaf  redhat-langpacks.tar.gz
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-7b1df547e4cf6876ef3d867ee445ac80  DEV300_m26.tar.bz2


--- openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch DELETED ---


--- openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch DELETED ---


--- openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch DELETED ---


--- openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch DELETED ---


--- openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch DELETED ---


--- workspace.native172.patch DELETED ---


