rpms/openoffice.org/devel openoffice.org.spec, 1.2288, 1.2289 workspace.impress195.patch, 1.1, 1.2 openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch, 1.4, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Jul 14 14:01:52 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4224
Modified Files:
openoffice.org.spec workspace.impress195.patch
Removed Files:
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.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.2288
retrieving revision 1.2289
diff -u -p -r1.2288 -r1.2289
--- openoffice.org.spec 14 Jul 2010 13:06:51 -0000 1.2288
+++ openoffice.org.spec 14 Jul 2010 14:01:50 -0000 1.2289
@@ -93,34 +93,33 @@ Patch15: openoffice.org-3.1.0.ooo101354.
Patch16: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
Patch17: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
Patch18: workspace.impress195.patch
-Patch19: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch20: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch21: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch22: workspace.srb1.patch
-Patch23: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch24: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch25: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch26: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch27: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch28: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
-Patch29: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch30: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch31: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch32: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch33: workspace.writerfilter08.patch
-Patch34: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch35: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch36: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch37: workspace.vcl113.patch
-Patch38: workspace.tl81.patch
-Patch39: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch40: workspace.gtk3.patch
-Patch41: workspace.sw33bf06.patch
-Patch42: workspace.sb128.patch
-Patch43: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
-Patch44: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
-Patch45: workspace.native317.patch
-Patch46: workspace.sb126.patch
+Patch19: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch20: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch21: workspace.srb1.patch
+Patch22: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch23: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch24: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch25: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch26: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch27: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+Patch28: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch29: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+Patch30: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch31: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch32: workspace.writerfilter08.patch
+Patch33: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch34: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch35: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch36: workspace.vcl113.patch
+Patch37: workspace.tl81.patch
+Patch38: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch39: workspace.gtk3.patch
+Patch40: workspace.sw33bf06.patch
+Patch41: workspace.sb128.patch
+Patch42: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
+Patch43: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
+Patch44: workspace.native317.patch
+Patch45: workspace.sb126.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1627,34 +1626,33 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch16 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
%patch17 -p0 -b .ooo102061.sc.cellanchoring.patch
%patch18 -p0 -b .workspace.impress195.patch
-%patch19 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch20 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch21 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch22 -p1 -b .workspace.srb1.patch
-%patch23 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch24 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch25 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch26 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch27 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch28 -p1 -b .ooo74188.indiccursor.editeng.patch
-%patch29 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch30 -p0 -b .ooo111699.svx.nullfield.patch
-%patch31 -p0 -b .ooo111758.sd.xerror.patch
-%patch32 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch33 -p0 -b .workspace.writerfilter08.patch
-%patch34 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch35 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch36 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch37 -p0 -b .workspace.vcl113.patch
-%patch38 -p0 -b .workspace.tl81.patch
-%patch39 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch40 -p0 -b .workspace.gtk3.patch
-%patch41 -p0 -b .workspace.sw33bf06.patch
-%patch42 -p1 -b .workspace.sb128.patch
-%patch43 -p0 -b .oooXXXXX.offapi.weirdness.patch
-%patch44 -p0 -b .oooXXXXX.afms.buildtype.patch
-%patch45 -p1 -b .workspace.native317.patch
-%patch46 -p1 -b .workspace.sb126.patch
+%patch19 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch20 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch21 -p1 -b .workspace.srb1.patch
+%patch22 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch23 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch24 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch25 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch26 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch27 -p1 -b .ooo74188.indiccursor.editeng.patch
+%patch28 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch29 -p0 -b .ooo111699.svx.nullfield.patch
+%patch30 -p0 -b .ooo111758.sd.xerror.patch
+%patch31 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch32 -p0 -b .workspace.writerfilter08.patch
+%patch33 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch34 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch35 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch36 -p0 -b .workspace.vcl113.patch
+%patch37 -p0 -b .workspace.tl81.patch
+%patch38 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch39 -p0 -b .workspace.gtk3.patch
+%patch40 -p0 -b .workspace.sw33bf06.patch
+%patch41 -p1 -b .workspace.sb128.patch
+%patch42 -p0 -b .oooXXXXX.offapi.weirdness.patch
+%patch43 -p0 -b .oooXXXXX.afms.buildtype.patch
+%patch44 -p1 -b .workspace.native317.patch
+%patch45 -p1 -b .workspace.sb126.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1663,6 +1661,7 @@ POORHELPS=`find l10n/source -name locali
autoconf
%configure \
+ --with-vendor="Red Hat, Inc." \
--with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
--enable-symbols --disable-ldap --disable-epm --disable-mathmldtd \
--disable-Xaw --disable-gnome-vfs --enable-gio --enable-symbols \
@@ -1695,8 +1694,6 @@ cp -f %{SOURCE19} smoketestoo_native/dat
source ./Linux*Env.Set.sh
#unneccessary to build for both hash types
unset HAVE_LD_HASH_STYLE
-#Set the "This product has been created by..." in Help->About
-export OOO_VENDOR="Red Hat, Inc."
#use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do
case "$i" in
workspace.impress195.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/attribute/fontattribute.hxx | 2 +
drawinglayer/source/attribute/fontattribute.cxx | 20 +++++++++++---
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +
drawinglayer/source/processor2d/canvasprocessor.cxx | 5 +++
sd/source/ui/framework/factories/BasicViewFactory.cxx | 3 +-
sd/source/ui/framework/factories/BasicViewFactory.hxx | 1
11 files changed, 56 insertions(+), 6 deletions(-)
Index: workspace.impress195.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress195.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.impress195.patch 14 Jul 2010 11:57:28 -0000 1.1
+++ workspace.impress195.patch 14 Jul 2010 14:01:51 -0000 1.2
@@ -22,3 +22,265 @@ diff -ru sd.orig/source/ui/framework/fac
::boost::shared_ptr<ViewCache> mpViewCache;
css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;
+Index: cppcanvas/source/mtfrenderer/implrenderer.cxx
+===================================================================
+--- cppcanvas/source/mtfrenderer/implrenderer.cxx (revision 276100)
++++ cppcanvas/source/mtfrenderer/implrenderer.cxx (working copy)
+@@ -43,6 +43,7 @@
+ #include <com/sun/star/rendering/TexturingMode.hpp>
+ #include <com/sun/star/uno/Sequence.hxx>
+ #include <com/sun/star/geometry/RealPoint2D.hpp>
++#include <com/sun/star/rendering/PanoseProportion.hpp>
+ #include <com/sun/star/rendering/ViewState.hpp>
+ #include <com/sun/star/rendering/RenderState.hpp>
+ #include <com/sun/star/rendering/XCanvasFont.hpp>
+@@ -850,6 +851,12 @@
+ rParms.mrParms.maFontLetterForm.isValid() ?
+ rParms.mrParms.maFontLetterForm.getValue() :
+ (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
++ aFontRequest.FontDescription.FontDescription.Proportion =
++ rParms.mrParms.maFontProportion.isValid() ?
++ rParms.mrParms.maFontProportion.getValue() :
++ (rFont.GetPitch() == PITCH_FIXED)
++ ? rendering::PanoseProportion::MONO_SPACED
++ : rendering::PanoseProportion::ANYTHING;
+
+ LanguageType aLang = rFont.GetLanguage();
+ aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
+@@ -2967,7 +2974,8 @@
+ if( rParams.maFontName.isValid() ||
+ rParams.maFontWeight.isValid() ||
+ rParams.maFontLetterForm.isValid() ||
+- rParams.maFontUnderline.isValid() )
++ rParams.maFontUnderline.isValid() ||
++ rParams.maFontProportion.isValid() )
+ {
+ ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );
+
+Index: cppcanvas/inc/cppcanvas/renderer.hxx
+===================================================================
+--- cppcanvas/inc/cppcanvas/renderer.hxx (revision 276100)
++++ cppcanvas/inc/cppcanvas/renderer.hxx (working copy)
+@@ -139,6 +139,9 @@
+ /// Optionally forces the given font letter form (italics etc.) for all text actions
+ ::comphelper::OptionalValue< sal_Int8 > maFontLetterForm;
+
++ /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions
++ ::comphelper::OptionalValue< sal_Int8 > maFontProportion;
++
+ /// Optionally forces underlining for all text actions
+ ::comphelper::OptionalValue< bool > maFontUnderline;
+ };
+Index: canvas/source/directx/dx_textlayout_drawhelper.cxx
+===================================================================
+--- canvas/source/directx/dx_textlayout_drawhelper.cxx (revision 276100)
++++ canvas/source/directx/dx_textlayout_drawhelper.cxx (working copy)
+@@ -135,6 +135,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 );
++ aFont.SetPitch(
++ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
++ ? PITCH_FIXED : PITCH_VARIABLE);
+
+ aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
+@@ -267,6 +270,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 );
++ aFont.SetPitch(
++ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
++ ? PITCH_FIXED : PITCH_VARIABLE);
+
+ // adjust to stretched font
+ if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11))
+Index: canvas/source/vcl/canvasfont.cxx
+===================================================================
+--- canvas/source/vcl/canvasfont.cxx (revision 276100)
++++ canvas/source/vcl/canvasfont.cxx (working copy)
+@@ -38,6 +38,8 @@
+ #include <i18npool/mslangid.hxx>
+ #include <vcl/metric.hxx>
+
++#include <com/sun/star/rendering/PanoseProportion.hpp>
++
+ #include "canvasfont.hxx"
+ #include "textlayout.hxx"
+
+@@ -66,6 +68,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 );
++ maFont->SetPitch(
++ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
++ ? PITCH_FIXED : PITCH_VARIABLE);
+
+ maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
+Index: canvas/source/cairo/cairo_canvasfont.cxx
+===================================================================
+--- canvas/source/cairo/cairo_canvasfont.cxx (revision 276100)
++++ canvas/source/cairo/cairo_canvasfont.cxx (working copy)
+@@ -33,6 +33,8 @@
+
+ #include <canvas/debug.hxx>
+
++#include <com/sun/star/rendering/PanoseProportion.hpp>
++
+ #include <rtl/math.hxx>
+ #include <basegfx/numeric/ftools.hxx>
+
+@@ -86,6 +88,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 );
++ maFont->SetPitch(
++ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
++ ? PITCH_FIXED : PITCH_VARIABLE);
+
+ maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
+Index: drawinglayer/source/processor2d/canvasprocessor.cxx
+===================================================================
+--- drawinglayer/source/processor2d/canvasprocessor.cxx (revision 276100)
++++ drawinglayer/source/processor2d/canvasprocessor.cxx (working copy)
+@@ -57,6 +57,7 @@
+ #include <basegfx/tuple/b2i64tuple.hxx>
+ #include <basegfx/range/b2irange.hxx>
+ #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
++#include <com/sun/star/rendering/PanoseProportion.hpp>
+ #include <com/sun/star/rendering/CompositeOperation.hpp>
+ #include <com/sun/star/rendering/StrokeAttributes.hpp>
+ #include <com/sun/star/rendering/PathJoinType.hpp>
+@@ -1517,6 +1518,10 @@
+ aFontRequest.FontDescription.IsVertical = rFontAttr.getVertical() ? util::TriState_YES : util::TriState_NO;
+ // TODO(F2): improve vclenum->panose conversion
+ aFontRequest.FontDescription.FontDescription.Weight = static_cast< sal_uInt8 >(rFontAttr.getWeight());
++ aFontRequest.FontDescription.FontDescription.Proportion =
++ rFontAttr.getMonospaced()
++ ? rendering::PanoseProportion::MONO_SPACED
++ : rendering::PanoseProportion::ANYTHING;
+ aFontRequest.FontDescription.FontDescription.Letterform = rFontAttr.getItalic() ? 9 : 0;
+
+ // init CellSize to 1.0, else a default font height will be used
+Index: drawinglayer/source/primitive2d/textlayoutdevice.cxx
+===================================================================
+--- drawinglayer/source/primitive2d/textlayoutdevice.cxx (revision 276100)
++++ drawinglayer/source/primitive2d/textlayoutdevice.cxx (working copy)
+@@ -406,6 +406,7 @@
+ aRetval.SetWeight(static_cast<FontWeight>(rFontAttribute.getWeight()));
+ aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
+ aRetval.SetOutline(rFontAttribute.getOutline());
++ aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
+ aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale));
+
+ #ifdef WIN32
+@@ -445,6 +446,7 @@
+ RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
+ rFont.IsVertical(),
+ ITALIC_NONE != rFont.GetItalic(),
++ PITCH_FIXED == rFont.GetPitch(),
+ rFont.IsOutline(),
+ bRTL,
+ bBiDiStrong);
+--- drawinglayer/source/attribute/fontattribute.cxx 2010-07-06 16:05:42.000000000 +0100
++++ drawinglayer/source/attribute/fontattribute.cxx 2010-07-06 16:06:02.000000000 +0100
+@@ -55,6 +55,7 @@
+ unsigned mbOutline : 1; // Outline Flag
+ unsigned mbRTL : 1; // RTL Flag
+ unsigned mbBiDiStrong : 1; // BiDi Flag
++ unsigned mbMonospaced : 1;
+
+ ImpFontAttribute(
+ const String& rFamilyName,
+@@ -63,6 +64,7 @@
+ bool bSymbol,
+ bool bVertical,
+ bool bItalic,
++ bool bMonospaced,
+ bool bOutline,
+ bool bRTL,
+ bool bBiDiStrong)
+@@ -75,7 +77,8 @@
+ mbItalic(bItalic),
+ mbOutline(bOutline),
+ mbRTL(bRTL),
+- mbBiDiStrong(bBiDiStrong)
++ mbBiDiStrong(bBiDiStrong),
++ mbMonospaced(bMonospaced)
+ {
+ }
+
+@@ -89,6 +92,7 @@
+ bool getOutline() const { return mbOutline; }
+ bool getRTL() const { return mbRTL; }
+ bool getBiDiStrong() const { return mbBiDiStrong; }
++ bool getMonospaced() const { return mbMonospaced; }
+
+ bool operator==(const ImpFontAttribute& rCompare) const
+ {
+@@ -100,7 +104,8 @@
+ && getItalic() == rCompare.getItalic()
+ && getOutline() == rCompare.getOutline()
+ && getRTL() == rCompare.getRTL()
+- && getBiDiStrong() == rCompare.getBiDiStrong());
++ && getBiDiStrong() == rCompare.getBiDiStrong()
++ && getMonospaced() == rCompare.getMonospaced());
+ }
+
+ static ImpFontAttribute* get_global_default()
+@@ -112,7 +117,7 @@
+ pDefault = new ImpFontAttribute(
+ String(), String(),
+ 0,
+- false, false, false, false, false, false);
++ false, false, false, false, false, false, false);
+
+ // never delete; start with RefCount 1, not 0
+ pDefault->mnRefCount++;
+@@ -129,11 +134,12 @@
+ bool bSymbol,
+ bool bVertical,
+ bool bItalic,
++ bool bMonospaced,
+ bool bOutline,
+ bool bRTL,
+ bool bBiDiStrong)
+ : mpFontAttribute(new ImpFontAttribute(
+- rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bOutline, bRTL, bBiDiStrong))
++ rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong))
+ {
+ }
+
+@@ -246,6 +252,12 @@
+ return mpFontAttribute->getBiDiStrong();
+ }
+
++ bool FontAttribute::getMonospaced() const
++ {
++ return mpFontAttribute->getMonospaced();
++ }
++
++
+ } // end of namespace attribute
+ } // end of namespace drawinglayer
+
+--- drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx 2010-07-07 11:39:31.000000000 +0100
++++ drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx 2010-07-07 11:44:38.000000000 +0100
+@@ -65,6 +65,7 @@
+ bool bSymbol = false,
+ bool bVertical = false,
+ bool bItalic = false,
++ bool bMonospaced = false,
+ bool bOutline = false,
+ bool bRTL = false,
+ bool bBiDiStrong = false);
+@@ -89,6 +90,7 @@
+ bool getOutline() const;
+ bool getRTL() const;
+ bool getBiDiStrong() const;
++ bool getMonospaced() const;
+ };
+ } // end of namespace attribute
+ } // end of namespace drawinglayer
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch DELETED ---
More information about the scm-commits
mailing list