rpms/openoffice.org/devel openoffice.org.spec, 1.2197, 1.2198 workspace.tl80.patch, 1.2, 1.3 openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch, 1.3, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Apr 27 07:55:53 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8768
Modified Files:
openoffice.org.spec workspace.tl80.patch
Removed Files:
openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
Log Message:
merge patch into accepted workspace
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2197
retrieving revision 1.2198
diff -u -p -r1.2197 -r1.2198
--- openoffice.org.spec 26 Apr 2010 17:56:08 -0000 1.2197
+++ openoffice.org.spec 27 Apr 2010 07:55:49 -0000 1.2198
@@ -74,66 +74,65 @@ Patch3: openoffice.org-2.0.1.ooo58606.s
Patch4: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch5: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
Patch6: workspace.printerpullpages.patch
-Patch7: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch8: ooo-build.ooo68717.gstreamer.video.patch
-Patch9: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch10: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch11: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch12: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch13: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch14: workspace.fchints01.patch
-Patch15: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch16: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch17: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch18: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch19: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch20: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch21: ooo-build.ooo2497.filter.svg.patch
-Patch22: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch23: workspace.slideshow1.patch
-Patch24: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch25: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch26: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch27: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch28: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch29: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch30: workspace.sdfindall.patch
-Patch31: workspace.dr73.patch
-Patch32: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch33: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch34: openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch
-Patch35: workspace.vcl106.patch
-Patch36: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch37: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch38: workspace.gsminhibit.patch
-Patch39: workspace.vcl107.patch
-Patch40: workspace.hb33patches1.patch
-Patch41: workspace.cmcfixes67.patch
-Patch42: workspace.srb1.patch
-Patch43: workspace.thbfixes10.patch
-Patch44: workspace.vcl108.patch
-Patch45: workspace.pythonssldedux.patch
-Patch46: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch47: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch48: workspace.sw33bf03.patch
-Patch49: workspace.writerfilter07.patch
-Patch50: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch51: workspace.sw33bf02.patch
-Patch52: openoffice.org-3.2.0.ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
-Patch53: openoffice.org-3.2.0.ooo96362.filter.nondeterministic.order.patch
-Patch54: workspace.cmcfixes70.patch
-Patch55: workspace.s390xport02.patch
-Patch56: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch57: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch58: workspace.calc53.patch
-Patch59: workspace.impress188.patch
-Patch60: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch61: workspace.koheicsvimport.patch
-Patch62: workspace.odfmetadata4.patch
-Patch63: workspace.tl80.patch
-Patch64: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch65: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
-Patch66: workspace.fwk140.patch
+Patch7: ooo-build.ooo68717.gstreamer.video.patch
+Patch8: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch9: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch10: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch11: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch12: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch13: workspace.fchints01.patch
+Patch14: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch15: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch16: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch17: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch18: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch19: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch20: ooo-build.ooo2497.filter.svg.patch
+Patch21: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch22: workspace.slideshow1.patch
+Patch23: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch24: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch25: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch26: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch27: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch28: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch29: workspace.sdfindall.patch
+Patch30: workspace.dr73.patch
+Patch31: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch32: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch33: openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch
+Patch34: workspace.vcl106.patch
+Patch35: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch36: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch37: workspace.gsminhibit.patch
+Patch38: workspace.vcl107.patch
+Patch39: workspace.hb33patches1.patch
+Patch40: workspace.cmcfixes67.patch
+Patch41: workspace.srb1.patch
+Patch42: workspace.thbfixes10.patch
+Patch43: workspace.vcl108.patch
+Patch44: workspace.pythonssldedux.patch
+Patch45: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch46: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch47: workspace.sw33bf03.patch
+Patch48: workspace.writerfilter07.patch
+Patch49: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch50: workspace.sw33bf02.patch
+Patch51: openoffice.org-3.2.0.ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
+Patch52: openoffice.org-3.2.0.ooo96362.filter.nondeterministic.order.patch
+Patch53: workspace.cmcfixes70.patch
+Patch54: workspace.s390xport02.patch
+Patch55: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch56: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch57: workspace.calc53.patch
+Patch58: workspace.impress188.patch
+Patch59: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch60: workspace.koheicsvimport.patch
+Patch61: workspace.odfmetadata4.patch
+Patch62: workspace.tl80.patch
+Patch63: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch64: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
+Patch65: workspace.fwk140.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1621,66 +1620,65 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch4 -p1
%patch5 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
%patch6 -p0 -b .workspace.printerpullpages.patch
-%patch7 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch8 -p0 -b .ooo68717.gstreamer.video.patch
-%patch9 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch10 -p1 -b .ooo76649.httpencoding.patch
-%patch11 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch12 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch13 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch14 -p1 -b .workspace.fchints01.patch
-%patch15 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch16 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch17 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch18 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch19 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch20 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch21 -p1 -b .ooo2497.filter.svg.patch
-%patch22 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch23 -p1 -b .workspace.slideshow1.patch
-%patch24 -p0 -b .ooo101274.opening-a-directory.patch
-%patch25 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch26 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch27 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch28 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch29 -p0 -b .ooo102142.sd.resleak.patch
-%patch30 -p0 -b .workspace.sdfindall.patch
-%patch31 -p0 -b .workspace.dr73.patch
-%patch32 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch33 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch34 -p1 -b .ooo109280.sal.justcoredump.patch
-%patch35 -p0 -b .workspace.vcl106.patch
-%patch36 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch37 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch38 -p1 -b .workspace.gsminhibit.patch
-%patch39 -p1 -b .workspace.vcl107.patch
-%patch40 -p0 -b .workspace.hb33patches1.patch
-%patch41 -p1 -b .workspace.cmcfixes67.patch
-%patch42 -p1 -b .workspace.srb1.patch
-%patch43 -p0 -b .workspace.thbfixes10.patch
-%patch44 -p0 -b .workspace.vcl108.patch
-%patch45 -p1 -b .workspace.pythonssldedux.patch
-%patch46 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch47 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch48 -p1 -b .workspace.sw33bf03.patch
-%patch49 -p0 -b .workspace.writerfilter07.patch
-%patch50 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch51 -p1 -b .workspace.sw33bf02.patch
-%patch52 -p0 -b .ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
-%patch53 -p0 -b .ooo96362.filter.nondeterministic.order.patch
-%patch54 -p1 -b .workspace.cmcfixes70.patch
-%patch55 -p1 -b .workspace.s390xport02.patch
-%patch56 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch57 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch58 -p0 -b .workspace.calc53.patch
-%patch59 -p0 -b .workspace.impress188.patch
-%patch60 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch61 -p1 -b .workspace.koheicsvimport.patch
-%patch62 -p1 -b .workspace.odfmetadata4.patch
-%patch63 -p0 -b .workspace.tl80.patch
-%patch64 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch65 -p1 -b .ooo111152.i18npool.viramacursor.patch
-%patch66 -p1 -b .workspace.fwk140.patch
+%patch7 -p0 -b .ooo68717.gstreamer.video.patch
+%patch8 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch9 -p1 -b .ooo76649.httpencoding.patch
+%patch10 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch11 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch12 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch13 -p1 -b .workspace.fchints01.patch
+%patch14 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch15 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch16 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch17 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch18 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch19 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch20 -p1 -b .ooo2497.filter.svg.patch
+%patch21 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch22 -p1 -b .workspace.slideshow1.patch
+%patch23 -p0 -b .ooo101274.opening-a-directory.patch
+%patch24 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch25 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch26 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch27 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch28 -p0 -b .ooo102142.sd.resleak.patch
+%patch29 -p0 -b .workspace.sdfindall.patch
+%patch30 -p0 -b .workspace.dr73.patch
+%patch31 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch32 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch33 -p1 -b .ooo109280.sal.justcoredump.patch
+%patch34 -p0 -b .workspace.vcl106.patch
+%patch35 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch36 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch37 -p1 -b .workspace.gsminhibit.patch
+%patch38 -p1 -b .workspace.vcl107.patch
+%patch39 -p0 -b .workspace.hb33patches1.patch
+%patch40 -p1 -b .workspace.cmcfixes67.patch
+%patch41 -p1 -b .workspace.srb1.patch
+%patch42 -p0 -b .workspace.thbfixes10.patch
+%patch43 -p0 -b .workspace.vcl108.patch
+%patch44 -p1 -b .workspace.pythonssldedux.patch
+%patch45 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch46 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch47 -p1 -b .workspace.sw33bf03.patch
+%patch48 -p0 -b .workspace.writerfilter07.patch
+%patch49 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch50 -p1 -b .workspace.sw33bf02.patch
+%patch51 -p0 -b .ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
+%patch52 -p0 -b .ooo96362.filter.nondeterministic.order.patch
+%patch53 -p1 -b .workspace.cmcfixes70.patch
+%patch54 -p1 -b .workspace.s390xport02.patch
+%patch55 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch56 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch57 -p0 -b .workspace.calc53.patch
+%patch58 -p0 -b .workspace.impress188.patch
+%patch59 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch60 -p1 -b .workspace.koheicsvimport.patch
+%patch61 -p1 -b .workspace.odfmetadata4.patch
+%patch62 -p1 -b .workspace.tl80.patch
+%patch63 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch64 -p1 -b .ooo111152.i18npool.viramacursor.patch
+%patch65 -p1 -b .workspace.fwk140.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.tl80.patch:
editeng/source/editeng/impedit2.cxx | 10 ++++++++++
linguistic/source/dicimp.cxx | 4 ++--
svx/source/editeng/impedit.cxx | 13 ++++++++-----
3 files changed, 20 insertions(+), 7 deletions(-)
Index: workspace.tl80.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.tl80.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.tl80.patch 23 Apr 2010 07:33:35 -0000 1.2
+++ workspace.tl80.patch 27 Apr 2010 07:55:50 -0000 1.3
@@ -1,6 +1,5 @@
-diff -ru svx.orig/source/editeng/impedit.cxx svx/source/editeng/impedit.cxx
---- svx.orig/source/editeng/impedit.cxx 2010-02-26 13:50:40.000000000 +0000
-+++ svx/source/editeng/impedit.cxx 2010-03-02 15:10:15.000000000 +0000
+--- a/svx/source/editeng/impedit.cxx 2010-02-26 13:50:40.000000000 +0000
++++ b/svx/source/editeng/impedit.cxx 2010-03-02 15:10:15.000000000 +0000
@@ -1497,7 +1497,7 @@
void ImpEditView::ShowDDCursor( const Rectangle& rRect )
@@ -56,9 +55,8 @@ diff -ru svx.orig/source/editeng/impedit
rDTDE.Context->rejectDrag();
}
}
-diff -ru linguistic.orig/source/dicimp.cxx linguistic/source/dicimp.cxx
---- linguistic.orig/source/dicimp.cxx 2009-10-19 12:29:09.000000000 +0100
-+++ linguistic/source/dicimp.cxx 2009-10-19 12:30:08.000000000 +0100
+--- a/linguistic/source/dicimp.cxx 2009-10-19 12:29:09.000000000 +0100
++++ b/linguistic/source/dicimp.cxx 2009-10-19 12:30:08.000000000 +0100
@@ -232,8 +232,8 @@
BOOL bExists = FileExists( rMainURL );
if( !bExists )
@@ -70,3 +68,24 @@ diff -ru linguistic.orig/source/dicimp.c
//! create physical representation of an **empty** dictionary
//! that could be found by the dictionary-list implementation
+diff -r 03068afc23c6 editeng/source/editeng/impedit2.cxx
+--- a/editeng/source/editeng/impedit2.cxx Sun Apr 25 15:43:24 2010 +0100
++++ b/editeng/source/editeng/impedit2.cxx Mon Apr 26 15:08:39 2010 +0100
+@@ -4198,7 +4198,17 @@
+ DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
+ }
+
++#if 0
+ long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
++#else
++ SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
++ SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
++ aTmpFont.SetPhysFont( GetRefDevice() );
++ ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
++ String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
++ long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
++ sSegment, 0, nPos+1, NULL ).Width();
++#endif
+
+ if ( !pPortion->IsRightToLeft() )
+ {
--- openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch DELETED ---
More information about the scm-commits
mailing list