rpms/openoffice.org/F-11 ooo-build.ooo2497.filter.svg.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, 1.1, 1.2 workspace.cmcfixes57.patch, 1.1, 1.2
Caolan McNamara
caolanm at fedoraproject.org
Fri Aug 28 10:06:03 UTC 2009
- Previous message (by thread): rpms/docbook-style-dsssl/devel docbook-style-dsssl.Makefile, 1.2, 1.3 docbook-style-dsssl.spec, 1.20, 1.21
- Next message (by thread): rpms/alliance/F-10 alliance-examples-adm2901.patch, NONE, 1.1 alliance-examples-go-all-clean.sh, NONE, 1.1 alliance-examples-go-all.sh, NONE, 1.1 alliance-examples-mipsR3000.patch, NONE, 1.1 alliance-tutorials-amd2901.patch, NONE, 1.1 alliance-tutorials-go-all-clean.sh, NONE, 1.1 alliance-tutorials-go-all.sh, NONE, 1.1 alliance-tutorials-place_n_route.patch, NONE, 1.1 alliance-tutorials-simulation.patch, NONE, 1.1 alliance-tutorials-start.patch, NONE, 1.1 alliance-tutorials-synthesis.patch, NONE, 1.1 alliance-xgra-xgrerror-ld.patch, NONE, 1.1 alliance-xgra.patch, NONE, 1.1 xgra.desktop, NONE, 1.1 xgra.png, NONE, 1.1 .cvsignore, 1.3, 1.4 alliance-env.patch, 1.5, 1.6 alliance.spec, 1.19, 1.20 dreal.desktop, 1.3, 1.4 graal.desktop, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 xfsm.desktop, 1.3, 1.4 xpat.desktop, 1.3, 1.4 xsch.desktop, 1.3, 1.4 xvpn.desktop, 1.3, 1.4 alliance-gcc43.patch, 1.1, NONE alliance-generic.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12617
Modified Files:
ooo-build.ooo2497.filter.svg.patch
openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
workspace.cmcfixes57.patch
Log Message:
fix up patches
ooo-build.ooo2497.filter.svg.patch:
OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu | 13
OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu | 10
OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu | 6
OOO310_m6/filter/source/svg/b2dellipse.cxx | 139
OOO310_m6/filter/source/svg/b2dellipse.hxx | 77
OOO310_m6/filter/source/svg/exports.map | 5
OOO310_m6/filter/source/svg/gentoken.pl | 58
OOO310_m6/filter/source/svg/gfxtypes.hxx | 343 +
OOO310_m6/filter/source/svg/makefile.mk | 51
OOO310_m6/filter/source/svg/parserfragments.cxx | 600 ++
OOO310_m6/filter/source/svg/parserfragments.hxx | 74
OOO310_m6/filter/source/svg/spirit_supplements.hxx | 115
OOO310_m6/filter/source/svg/svgfilter.cxx | 102
OOO310_m6/filter/source/svg/svgfilter.hxx | 46
OOO310_m6/filter/source/svg/svgimport.cxx | 197
OOO310_m6/filter/source/svg/svgreader.cxx | 2772 ++++++++++
OOO310_m6/filter/source/svg/svgreader.hxx | 43
OOO310_m6/filter/source/svg/test/makefile.mk | 115
OOO310_m6/filter/source/svg/test/odfserializer.cxx | 140
OOO310_m6/filter/source/svg/test/odfserializer.hxx | 31
OOO310_m6/filter/source/svg/test/parsertest.cxx | 210
OOO310_m6/filter/source/svg/test/svg2odf.cxx | 124
OOO310_m6/filter/source/svg/tokenmap.cxx | 62
OOO310_m6/filter/source/svg/tokenmap.hxx | 32
OOO310_m6/filter/source/svg/tokens.txt | 403 +
OOO310_m6/filter/source/svg/units.cxx | 99
OOO310_m6/filter/source/svg/units.hxx | 60
filter/source/svg/units.cxx | 27
30 files changed, 5698 insertions(+), 258 deletions(-)
Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo2497.filter.svg.patch 18 Mar 2009 12:36:26 -0000 1.1
+++ ooo-build.ooo2497.filter.svg.patch 28 Aug 2009 10:06:03 -0000 1.2
@@ -6233,3 +6233,47 @@ diff -ruN OOO310_m6.orig/filter/source/s
+} // namespace svgi
+
+#endif
+diff -ruN OOO310_m6.orig/filter/source/svg/units.cxx OOO310_m6/filter/source/svg/units.hxx
+--- OOO310_m6.orig/filter/source/svg/units.cxx 1970-01-01 01:00:00.000000000 +0100
++++ OOO310_m6/filter/source/svg/units.cxx 2009-03-17 14:59:37.000000000 +0000
+@@ -35,10 +35,6 @@
+
+ double convLength( double value, SvgUnit unit, const State& rState, char dir )
+ {
+- const double fBoxLen( dir=='h' ? rState.maViewBox.getWidth() :
+- (dir=='v' ? rState.maViewBox.getHeight() :
+- rState.maViewBox.getRange().getLength()));
+-
+ // convert svg unit to internal coordinates ("pixel"). Since the
+ // OOo drawing layer is still largely integer-based, the initial
+ // viewport transformation includes a certain scale factor
+@@ -55,7 +51,28 @@
+ case SVG_LENGTH_UNIT_PT: break;
+ case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break;
+ case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break;
+- case SVG_LENGTH_UNIT_PERCENTAGE: fRet *= fBoxLen; break;
++ case SVG_LENGTH_UNIT_PERCENTAGE:
++ {
++ double fBoxLen;
++ if (rState.maViewBox.isEmpty())
++ {
++ basegfx::B2DRange aDefaultBox(0, 0,
++ convLength(210, SVG_LENGTH_UNIT_MM, rState, 'h'),
++ convLength(297, SVG_LENGTH_UNIT_MM, rState, 'v'));
++ fBoxLen = (dir=='h' ? aDefaultBox.getWidth() :
++ (dir=='v' ? aDefaultBox.getHeight() :
++ aDefaultBox.getRange().getLength()));
++ }
++ else
++ {
++ fBoxLen = (dir=='h' ? rState.maViewBox.getWidth() :
++ (dir=='v' ? rState.maViewBox.getHeight() :
++ rState.maViewBox.getRange().getLength()));
++ }
++
++ fRet *= fBoxLen/100.0;
++ }
++ break;
+ default: OSL_TRACE( "Unknown length type" ); break;
+ }
+
openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:
comphelper/source/misc/mediadescriptor.cxx | 1
ucbhelper/source/client/content.cxx | 75 +++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
Index: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 22 Apr 2009 13:46:04 -0000 1.1
+++ openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 28 Aug 2009 10:06:03 -0000 1.2
@@ -165,13 +165,11 @@ Index: comphelper/source/misc/mediadescr
===================================================================
--- comphelper/source/misc/mediadescriptor.cxx (revision 270567)
+++ comphelper/source/misc/mediadescriptor.cxx (working copy)
-@@ -727,7 +727,8 @@
- xRequest->getRequest() >>= exIO;
+@@ -728,6 +728,7 @@
bAbort = (
- (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED ) ||
-- (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-+ (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
-+ (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
- );
- }
- break;
+ (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED )
+ || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
++ || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+ #ifdef MACOSX
+ // this is a workaround for MAC, on this platform if the file is locked
+ // the returned error code looks to be wrong
workspace.cmcfixes57.patch:
servicedecl.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: workspace.cmcfixes57.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.cmcfixes57.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.cmcfixes57.patch 15 Apr 2009 15:59:21 -0000 1.1
+++ workspace.cmcfixes57.patch 28 Aug 2009 10:06:03 -0000 1.2
@@ -37,22 +37,3 @@ index bd114be..1fa97cc 100644
::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
::com::sun::star::registry::XRegistryKey* pRegistryKey ) \
{ \
-diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
---- sw.orig/source/filter/ww8/ww8par2.cxx 2009-03-10 12:59:18.000000000 +0000
-+++ sw/source/filter/ww8/ww8par2.cxx 2009-03-10 13:51:17.000000000 +0000
-@@ -2509,7 +2509,15 @@
- //ability to set the margin.
- SvxLRSpaceItem aL( RES_LR_SPACE );
- // set right to original DxaLeft (i28656)
-+#if 0
-+ // Type don't get promoted the intuitive way
- aL.SetLeft( !bIsBiDi ? GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft);
-+#else
-+ if (!bIsBiDi)
-+ aL.SetLeft( GetMinLeft() );
-+ else
-+ aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft );
-+#endif
- aItemSet.Put(aL);
- }
- }
- Previous message (by thread): rpms/docbook-style-dsssl/devel docbook-style-dsssl.Makefile, 1.2, 1.3 docbook-style-dsssl.spec, 1.20, 1.21
- Next message (by thread): rpms/alliance/F-10 alliance-examples-adm2901.patch, NONE, 1.1 alliance-examples-go-all-clean.sh, NONE, 1.1 alliance-examples-go-all.sh, NONE, 1.1 alliance-examples-mipsR3000.patch, NONE, 1.1 alliance-tutorials-amd2901.patch, NONE, 1.1 alliance-tutorials-go-all-clean.sh, NONE, 1.1 alliance-tutorials-go-all.sh, NONE, 1.1 alliance-tutorials-place_n_route.patch, NONE, 1.1 alliance-tutorials-simulation.patch, NONE, 1.1 alliance-tutorials-start.patch, NONE, 1.1 alliance-tutorials-synthesis.patch, NONE, 1.1 alliance-xgra-xgrerror-ld.patch, NONE, 1.1 alliance-xgra.patch, NONE, 1.1 xgra.desktop, NONE, 1.1 xgra.png, NONE, 1.1 .cvsignore, 1.3, 1.4 alliance-env.patch, 1.5, 1.6 alliance.spec, 1.19, 1.20 dreal.desktop, 1.3, 1.4 graal.desktop, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 xfsm.desktop, 1.3, 1.4 xpat.desktop, 1.3, 1.4 xsch.desktop, 1.3, 1.4 xvpn.desktop, 1.3, 1.4 alliance-gcc43.patch, 1.1, NONE alliance-generic.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list