rpms/openoffice.org/devel openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch, 1.1, 1.2 openoffice.org.spec, 1.2009, 1.2010
Caolan McNamara
caolanm at fedoraproject.org
Tue Sep 15 20:03:33 UTC 2009
- Previous message (by thread): rpms/f-spot/F-10 0001-gtk-version.patch, NONE, 1.1 f-spot.spec, 1.84, 1.85
- Next message (by thread): rpms/audit-viewer/devel .cvsignore, 1.4, 1.5 audit-viewer.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506
Modified Files:
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
openoffice.org.spec
Log Message:
defuzz patches
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
canvas/source/cairo/cairo_canvasfont.cxx | 5 +++++
canvas/source/directx/dx_textlayout_drawhelper.cxx | 6 ++++++
canvas/source/vcl/canvasfont.cxx | 5 +++++
cppcanvas/inc/cppcanvas/renderer.hxx | 3 +++
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 +++++++++-
drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx | 6 +++++-
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 ++
drawinglayer/source/primitive2d/textprimitive2d.cxx | 3 ++-
drawinglayer/source/processor2d/canvasprocessor.cxx | 5 +++++
9 files changed, 42 insertions(+), 3 deletions(-)
Index: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 15 Sep 2009 08:19:34 -0000 1.1
+++ openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 15 Sep 2009 20:03:32 -0000 1.2
@@ -10,7 +10,7 @@ Index: cppcanvas/source/mtfrenderer/impl
#include <com/sun/star/rendering/ViewState.hpp>
#include <com/sun/star/rendering/RenderState.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
-@@ -956,6 +957,12 @@
+@@ -955,6 +956,12 @@
rParms.mrParms.maFontLetterForm.isValid() ?
rParms.mrParms.maFontLetterForm.getValue() :
(rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -21,9 +21,9 @@ Index: cppcanvas/source/mtfrenderer/impl
+ ? rendering::PanoseProportion::MONO_SPACED
+ : rendering::PanoseProportion::ANYTHING;
- LanguageType aLang = rFont.GetLanguage();
- aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
-@@ -3073,7 +3080,8 @@
+ // setup state-local text transformation,
+ // if the font be rotated
+@@ -3061,7 +3068,8 @@
if( rParams.maFontName.isValid() ||
rParams.maFontWeight.isValid() ||
rParams.maFontLetterForm.isValid() ||
@@ -51,7 +51,7 @@ Index: canvas/source/directx/dx_textlayo
===================================================================
--- canvas/source/directx/dx_textlayout_drawhelper.cxx (revision 276100)
+++ canvas/source/directx/dx_textlayout_drawhelper.cxx (working copy)
-@@ -135,6 +135,9 @@
+@@ -134,6 +134,9 @@
aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -59,9 +59,9 @@ Index: canvas/source/directx/dx_textlayo
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
-
-@@ -267,6 +270,9 @@
+ // setup font color
+ aFont.SetColor( aColor );
+@@ -264,6 +267,9 @@
aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -83,7 +83,7 @@ Index: canvas/source/vcl/canvasfont.cxx
+
#include <rtl/math.hxx>
#include <basegfx/numeric/ftools.hxx>
- #include <i18npool/mslangid.hxx>
+
@@ -66,6 +68,9 @@
// TODO(F2): improve panose->vclenum conversion
maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
@@ -92,22 +92,22 @@ Index: canvas/source/vcl/canvasfont.cxx
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
-
+ // adjust to stretched/shrinked font
+ if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
Index: canvas/source/cairo/cairo_canvasfont.cxx
===================================================================
--- canvas/source/cairo/cairo_canvasfont.cxx (revision 276100)
+++ canvas/source/cairo/cairo_canvasfont.cxx (working copy)
-@@ -36,6 +36,8 @@
- #include <rtl/math.hxx>
- #include <basegfx/numeric/ftools.hxx>
+@@ -33,6 +33,8 @@
+
+ #include <canvas/debug.hxx>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+
- #include <vcl/metric.hxx>
- #include <i18npool/mslangid.hxx>
+ #include <rtl/math.hxx>
+ #include <basegfx/numeric/ftools.hxx>
-@@ -86,6 +88,9 @@
+@@ -85,6 +87,9 @@
// TODO(F2): improve panose->vclenum conversion
maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -115,8 +115,8 @@ Index: canvas/source/cairo/cairo_canvasf
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
-
+ // adjust to stretched/shrinked font
+ if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
Index: drawinglayer/source/processor2d/canvasprocessor.cxx
===================================================================
--- drawinglayer/source/processor2d/canvasprocessor.cxx (revision 276100)
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -p -r1.2009 -r1.2010
--- openoffice.org.spec 15 Sep 2009 16:13:04 -0000 1.2009
+++ openoffice.org.spec 15 Sep 2009 20:03:32 -0000 1.2010
@@ -1705,7 +1705,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
%patch84 -p0 -b .workspace.dr69.patch
%patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch86 -p0 -b .oooXXXXXX.sal.justcoredump.patch
+%patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
- Previous message (by thread): rpms/f-spot/F-10 0001-gtk-version.patch, NONE, 1.1 f-spot.spec, 1.84, 1.85
- Next message (by thread): rpms/audit-viewer/devel .cvsignore, 1.4, 1.5 audit-viewer.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list