rpms/openoffice.org/devel openoffice.org.spec, 1.2105, 1.2106 workspace.vcl108.patch, 1.4, 1.5

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.vcl108.patch 
Log Message:
add in valgrind fix of workspace.vcl108.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2105
retrieving revision 1.2106
diff -u -p -r1.2105 -r1.2106
--- openoffice.org.spec	17 Dec 2009 10:40:54 -0000	1.2105
+++ openoffice.org.spec	21 Dec 2009 12:36:51 -0000	1.2106
@@ -2137,8 +2137,8 @@ popd
 
 # rhbz#477435 package opensymbol separately
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts/truetype
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -d -m 0755 %{buildroot}%{_fontdir}
+install -p -m 0644 *.ttf %{buildroot}%{_fontdir}
 popd
 rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts
 

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 unx/source/gdi/salgdi.cxx           |   18 ++++++-
 util/makefile.mk                    |    1 
 5 files changed, 133 insertions(+), 16 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.vcl108.patch	17 Dec 2009 10:40:54 -0000	1.4
+++ workspace.vcl108.patch	21 Dec 2009 12:36:51 -0000	1.5
@@ -262,3 +262,53 @@ diff -ru vcl/util/makefile.mk vcl/util/m
      sal_uInt16 n = GetUInt16(table, 2, 1);
      int nStrBase = GetUInt16(table, 4, 1);
      int i;
+diff -ru vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi.cxx
+--- vcl/unx/source/gdi/salgdi.cxx	2009-11-27 11:33:16.000000000 +0000
++++ vcl/unx/source/gdi/salgdi.cxx	2009-11-27 14:57:27.000000000 +0000
+@@ -1427,14 +1427,17 @@
+         // unless it splits another trapezoid that is still active
+         bool bSplit = false;
+         ActiveTrapSet::iterator aActiveTrapsIt = aActiveTraps.begin();
+-        for(; aActiveTrapsIt != aActiveTraps.end(); ++aActiveTrapsIt )
++        while(aActiveTrapsIt != aActiveTraps.end())
+         {
+             XTrapezoid& rLeftTrap = aTrapVector[ *aActiveTrapsIt ];
+ 
+             // skip until first overlap candidate
+             // TODO: use stl::*er_bound() instead
+             if( IsLeftOf( aTrapezoid.left, rLeftTrap.left) )
++            {
++                ++aActiveTrapsIt;
+                 continue;
++            }
+ 
+             // in the ActiveTrapSet there are still trapezoids where
+             // a vertical overlap with new trapezoids is no longer possible
+@@ -1445,15 +1448,26 @@
+             {
+                 ActiveTrapSet::iterator it = aActiveTrapsIt;
+                 if( aActiveTrapsIt != aActiveTraps.begin() )
++                {
+                     --aActiveTrapsIt;
+-                aActiveTraps.erase( it );
++                    aActiveTraps.erase( it );
++                    ++aActiveTrapsIt;
++                }
++                else
++                {
++                    aActiveTraps.erase( it );
++                    aActiveTrapsIt = aActiveTraps.begin();
++                }
+                 continue;
+             }
+ 
+             // check if there is horizontal overlap
+             // aTrapezoid.left==rLeftTrap.right is allowed though
+             if( !IsLeftOf( aTrapezoid.left, rLeftTrap.right ) )
++            {
++                ++aActiveTrapsIt;
+                 continue;
++            }
+ 
+             // prepare to split the old trapezoid and keep its upper part
+             // find the old trapezoids entry in the VerticalTrapSet and remove it