rpms/openoffice.org/devel openoffice.org.spec, 1.1387, 1.1388 workspace.notes2.patch, 1.2, 1.3 openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch, 1.1, NONE openoffice.org-2.3.0.ooo74751.bean.mawt.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jan 15 10:10:52 UTC 2008
- Previous message (by thread): rpms/man-pages-cs/devel .cvsignore, 1.5, 1.6 man-pages-cs-0.17-noMANDIR.patch, 1.1, 1.2 man-pages-cs.spec, 1.16, 1.17 sources, 1.5, 1.6
- Next message (by thread): rpms/xdvik/devel pxdvik-22.84.13-use-system-libs.patch, NONE, 1.1 pxdvik-22.84.13.patch, NONE, 1.1 texlive-2007-xdvi-keepflag.patch, NONE, 1.1 texlive-2007-xprint.patch, NONE, 1.1 texlive-source-xdvi-numlock.patch, NONE, 1.1 texlive-xdvi-maxchar.patch, NONE, 1.1 vfontmap, NONE, 1.1 xdvi48x48.png, NONE, 1.1 xdvik-22.84.13-uint32_t-fix.patch, NONE, 1.1 xdvik-22.84.13-use-system-libs.patch, NONE, 1.1 xdvik-22.84.13-xdgopen.patch, NONE, 1.1 xdvik.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11160
Modified Files:
openoffice.org.spec workspace.notes2.patch
Removed Files:
openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch
openoffice.org-2.3.0.ooo74751.bean.mawt.patch
Log Message:
remove integrated patches
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1387
retrieving revision 1.1388
diff -u -r1.1387 -r1.1388
--- openoffice.org.spec 14 Jan 2008 17:32:18 -0000 1.1387
+++ openoffice.org.spec 15 Jan 2008 10:09:58 -0000 1.1388
@@ -79,66 +79,64 @@
Patch7: openoffice.org.langpack-common.template
Patch8: openoffice.org.langpack-acor.template
Patch9: openoffice.org.langpack-ctl.template
-Patch10: openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch
-Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
%if %{gtkprintui}
-Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
-Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch16: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch19: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch20: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch21: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch22: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch23: pseudoworkspace.valgrind1.patch
-Patch24: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch25: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch26: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch27: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch28: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch29: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
-Patch30: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch31: workspace.tl37.patch
-Patch32: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch33: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch34: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch35: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch36: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch37: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch38: openoffice.org-2.2.0.rh232389.tango.patch
-Patch39: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch40: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch41: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch42: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch43: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch44: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch46: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch47: workspace.unifysound01.patch
-Patch48: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch49: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
-Patch50: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch51: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch52: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch53: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch54: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
-Patch55: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch56: workspace.notes2.patch
-Patch57: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch58: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch59: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch60: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
-Patch61: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch62: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
-Patch63: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
-Patch64: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch65: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch66: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch67: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
+Patch13: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch14: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch15: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch20: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch21: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch22: pseudoworkspace.valgrind1.patch
+Patch23: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch24: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch25: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch26: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch27: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch28: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+Patch29: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch30: workspace.tl37.patch
+Patch31: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch32: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch33: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch34: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch35: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch36: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch37: openoffice.org-2.2.0.rh232389.tango.patch
+Patch38: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch39: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch40: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch41: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch42: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch46: workspace.unifysound01.patch
+Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch52: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
+Patch53: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch54: workspace.notes2.patch
+Patch55: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch56: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch57: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch58: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
+Patch59: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch60: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+Patch61: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
+Patch62: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch63: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch64: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch65: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
%define instdir %{_libdir}/openoffice.org
@@ -1032,66 +1030,64 @@
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
-%patch10 -p1 -b .rhXXXXXX.noxfonts.desktop.patch
-%patch11 -p1 -b .rh161886.rpath.desktop.patch
-%patch12 -p1 -b .rh151357.setlangtolocale.patch
+%patch10 -p1 -b .rh161886.rpath.desktop.patch
+%patch11 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
-%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch16 -p1 -b .ooo69368.fixxmlsec.patch
-%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch18 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch19 -p1
-%patch20 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch21 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch22 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch23 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch24 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch25 -p1 -b .rh217065.syncbackspace.patch
-%patch26 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch27 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH29} >> svtools/source/dialogs/localize.sdf
-%patch29 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
-%patch30 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch31 -p1 -b .tl37.patch
-%patch32 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch33 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch34 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch35 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch36 -p0 -b .ooo68717.gstreamer.video.patch
-%patch37 -p1 -b .ooo63159.sal.dtype.patch
-%patch38 -p1 -b .rh232389.tango.patch
-%patch39 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch40 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch41 -p1 -b .ooo80816.selinux.bridges.patch
-%patch42 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch43 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch44 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch45 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH46}
-%patch47 -p1 -b .workspace.unifysound01.patch
-%patch48 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch49 -p1 -b .ooo74751.bean.mawt.patch
-%patch50 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch51 -p1 -b .ooo76649.httpencoding.patc
-%patch52 -p1 -b .ooo82966.svx.missing3d.patch
-%patch53 -p1 -b .ooo81307.sw.word2.patch
-%patch54 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
-%patch55 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch56 -p1 -b .workspace.notes2.patch
-%patch57 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch58 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch59 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch60 -p1 -b .ooo84684.vcl.fixfontconfig.patch
-%patch61 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch62 -p1 -b .oo85055.psprint.linetoolong.patch
-%patch63 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
-%patch64 -p1 -b .ooo85097.desktop.pagein.patch
-%patch65 -p1
-%patch66 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch67 -p1 -b .ooo83410.solenv.renameserbian.patch
+%patch13 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch14 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch15 -p1 -b .ooo69368.fixxmlsec.patch
+%patch16 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch17 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch18 -p1
+%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch20 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch21 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch22 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch23 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch24 -p1 -b .rh217065.syncbackspace.patch
+%patch25 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch26 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH27} >> svtools/source/dialogs/localize.sdf
+%patch28 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+%patch29 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch30 -p1 -b .tl37.patch
+%patch31 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch32 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch33 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch34 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch35 -p0 -b .ooo68717.gstreamer.video.patch
+%patch36 -p1 -b .ooo63159.sal.dtype.patch
+%patch37 -p1 -b .rh232389.tango.patch
+%patch38 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch39 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch40 -p1 -b .ooo80816.selinux.bridges.patch
+%patch41 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch42 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch43 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH45}
+%patch46 -p1 -b .workspace.unifysound01.patch
+%patch47 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch48 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch49 -p1 -b .ooo76649.httpencoding.patc
+%patch50 -p1 -b .ooo82966.svx.missing3d.patch
+%patch51 -p1 -b .ooo81307.sw.word2.patch
+%patch52 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
+%patch53 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch54 -p1 -b .workspace.notes2.patch
+%patch55 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch56 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch57 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch58 -p1 -b .ooo84684.vcl.fixfontconfig.patch
+%patch59 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch60 -p1 -b .oo85055.psprint.linetoolong.patch
+%patch61 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
+%patch62 -p1 -b .ooo85097.desktop.pagein.patch
+%patch63 -p1
+%patch64 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch65 -p1 -b .ooo83410.solenv.renameserbian.patch
# temporary until hsqldb is updated in rawhide
sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2866,7 +2862,9 @@
%changelog
-* Mon Jan 14 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-2.1
+* Tue Jan 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-2.1
+- drop integrated openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+- drop integrated openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch
- next candidate
* Mon Jan 14 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.3
workspace.notes2.patch:
Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.notes2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.notes2.patch 8 Jan 2008 14:51:51 -0000 1.2
+++ workspace.notes2.patch 15 Jan 2008 10:09:58 -0000 1.3
@@ -3034,28 +3034,6 @@
}
}
-Index: sw/sw/source/core/text/itrform2.cxx
-diff -u sw/sw/source/core/text/itrform2.cxx:1.100 sw/sw/source/core/text/itrform2.cxx:1.99.130.2
---- sw/sw/source/core/text/itrform2.cxx:1.100 Thu Sep 27 02:14:21 2007
-+++ sw/sw/source/core/text/itrform2.cxx Fri Sep 28 09:32:15 2007
-@@ -142,7 +142,7 @@
- #endif
- #endif
-
--using namespace ::com::sun::star::i18n;
-+using namespace ::com::sun::star;;
-
- extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt );
- bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, xub_StrLen &rPos );
-@@ -2022,7 +2022,7 @@
- // step back six(!) more characters for complex scripts
- // this is required e.g., for Khmer (thank you, Javier!)
- const SwScriptInfo& rSI = GetInfo().GetParaPortion()->GetScriptInfo();
-- if ( ScriptType::COMPLEX == rSI.ScriptType( nReformat ) )
-+ if (::i18n::ScriptType::COMPLEX == rSI.ScriptType( nReformat ) )
- {
- if ( nReformat > GetInfo().GetLineStart() + 6 )
- nReformat -= 6;
Index: sw/sw/source/core/txtnode/atrfld.cxx
diff -u sw/sw/source/core/txtnode/atrfld.cxx:1.12 sw/sw/source/core/txtnode/atrfld.cxx:1.11.320.5
--- sw/sw/source/core/txtnode/atrfld.cxx:1.12 Thu Sep 27 02:23:16 2007
@@ -5008,7 +4986,7 @@
diff -u sw/sw/source/ui/docvw/edtwin.cxx:1.146 sw/sw/source/ui/docvw/edtwin.cxx:1.144.56.9
--- sw/sw/source/ui/docvw/edtwin.cxx:1.146 Thu Sep 27 04:40:19 2007
+++ sw/sw/source/ui/docvw/edtwin.cxx Thu Nov 29 02:53:54 2007
-@@ -322,6 +322,9 @@
+@@ -325,6 +325,9 @@
#include <vcl/svapp.hxx>
#endif
@@ -5018,23 +4996,21 @@
//JP 11.10.2001: enable test code for bug fix 91313
#if !defined( PRODUCT ) && (OSL_DEBUG_LEVEL > 1)
//#define TEST_FOR_BUG91313
-@@ -2191,7 +2194,14 @@
+@@ -2213,6 +2216,13 @@
case KS_KeyToView:
{
eKeyState = KS_Ende;
-- bNormalChar = !rKeyCode.IsControlMod() &&
-+
-+ if ((rKeyCode.GetCode() == KEY_N) && rKeyCode.IsMod1() && rKeyCode.IsMod2())
-+ {
-+ rView.GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
-+ break;
-+ }
-+
-+ bNormalChar = !rKeyCode.IsControlMod() &&
++
++ if ((rKeyCode.GetCode() == KEY_N) && rKeyCode.IsMod1() && rKeyCode.IsMod2())
++ {
++ rView.GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
++ break;
++ }
++
+ bNormalChar =
rKeyCode.GetModifier() != (KEY_MOD1) &&
rKeyCode.GetModifier() != (KEY_MOD1|KEY_SHIFT) &&
- SW_ISPRINTABLE( aCh );
-@@ -2584,8 +2594,6 @@
+@@ -2609,8 +2619,6 @@
@@ -5043,7 +5019,7 @@
void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
SwWrtShell &rSh = rView.GetWrtShell();
-@@ -2605,6 +2613,11 @@
+@@ -2630,6 +2638,11 @@
MouseEvent rMEvt(_rMEvt);
@@ -5055,7 +5031,7 @@
GrabFocus();
//ignore key modifiers for format paintbrush
-@@ -4607,9 +4620,14 @@
+@@ -4675,9 +4688,14 @@
void SwEditWin::GetFocus()
{
@@ -5073,7 +5049,7 @@
}
/******************************************************************************
-@@ -4667,6 +4685,9 @@
+@@ -4735,6 +4753,9 @@
SwInputChild* pChildWin = (SwInputChild*)GetView().GetViewFrame()->
GetChildWindow( nId );
--- openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch DELETED ---
--- openoffice.org-2.3.0.ooo74751.bean.mawt.patch DELETED ---
- Previous message (by thread): rpms/man-pages-cs/devel .cvsignore, 1.5, 1.6 man-pages-cs-0.17-noMANDIR.patch, 1.1, 1.2 man-pages-cs.spec, 1.16, 1.17 sources, 1.5, 1.6
- Next message (by thread): rpms/xdvik/devel pxdvik-22.84.13-use-system-libs.patch, NONE, 1.1 pxdvik-22.84.13.patch, NONE, 1.1 texlive-2007-xdvi-keepflag.patch, NONE, 1.1 texlive-2007-xprint.patch, NONE, 1.1 texlive-source-xdvi-numlock.patch, NONE, 1.1 texlive-xdvi-maxchar.patch, NONE, 1.1 vfontmap, NONE, 1.1 xdvi48x48.png, NONE, 1.1 xdvik-22.84.13-uint32_t-fix.patch, NONE, 1.1 xdvik-22.84.13-use-system-libs.patch, NONE, 1.1 xdvik-22.84.13-xdgopen.patch, NONE, 1.1 xdvik.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list