[openoffice.org] Resolves: rhbz#638185 cjk/ctl font sizes wrong in impress
Caolan McNamara
caolanm at fedoraproject.org
Tue Sep 28 15:29:32 UTC 2010
commit 162e3c5939c69dcbbdf2b10753120ccb5354676a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 28 16:29:30 2010 +0100
Resolves: rhbz#638185 cjk/ctl font sizes wrong in impress
.gitignore | 2 +-
...rg-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch | 64 ++++++++++++++++++++
openoffice.org.spec | 9 ++-
sources | 2 +-
4 files changed, 73 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2f2c8a..6b80636 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
description.xml
manifest.xml
redhat-langpacks.tar.gz
-OOO330_m8.tar.bz2
+OOO330_m9.tar.bz2
diff --git a/openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch b/openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
new file mode 100644
index 0000000..209c7cd
--- /dev/null
+++ b/openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
@@ -0,0 +1,64 @@
+diff -r 5f77587494c6 editeng/source/editeng/eehtml.cxx
+--- a/editeng/source/editeng/eehtml.cxx Mon Sep 27 20:33:10 2010 +0100
++++ b/editeng/source/editeng/eehtml.cxx Tue Sep 28 16:23:00 2010 +0100
+@@ -633,15 +633,30 @@
+ SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
+
+ aItems.ClearItem( EE_PARA_ULSPACE );
++
+ aItems.ClearItem( EE_CHAR_FONTHEIGHT );
+ aItems.ClearItem( EE_CHAR_FONTINFO );
+ aItems.ClearItem( EE_CHAR_WEIGHT );
+
++ aItems.ClearItem( EE_CHAR_FONTHEIGHT_CJK );
++ aItems.ClearItem( EE_CHAR_FONTINFO_CJK );
++ aItems.ClearItem( EE_CHAR_WEIGHT_CJK );
++
++ aItems.ClearItem( EE_CHAR_FONTHEIGHT_CTL );
++ aItems.ClearItem( EE_CHAR_FONTINFO_CTL );
++ aItems.ClearItem( EE_CHAR_WEIGHT_CTL );
++
+ // Fett in den ersten 3 Headings
+ if ( ( nHLevel >= 1 ) && ( nHLevel <= 3 ) )
+ {
+ SvxWeightItem aWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT );
+ aItems.Put( aWeightItem );
++
++ SvxWeightItem aWeightItemCJK( WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK );
++ aItems.Put( aWeightItem );
++
++ SvxWeightItem aWeightItemCTL( WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL );
++ aItems.Put( aWeightItem );
+ }
+
+ // Fonthoehe und Abstaende, wenn LogicToLogic moeglich:
+@@ -660,9 +675,16 @@
+ nPoints = 11;
+
+ nPoints = OutputDevice::LogicToLogic( nPoints, MAP_POINT, eUnit );
++
+ SvxFontHeightItem aHeightItem( nPoints, 100, EE_CHAR_FONTHEIGHT );
+ aItems.Put( aHeightItem );
+
++ SvxFontHeightItem aHeightItemCJK( nPoints, 100, EE_CHAR_FONTHEIGHT_CJK );
++ aItems.Put( aHeightItemCJK );
++
++ SvxFontHeightItem aHeightItemCTL( nPoints, 100, EE_CHAR_FONTHEIGHT_CTL );
++ aItems.Put( aHeightItemCTL );
++
+ // Absatzabstaende, wenn Heading:
+ if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
+ {
+@@ -679,6 +701,12 @@
+ Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
+ SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
+ aItems.Put( aFontItem );
++
++ SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
++ aItems.Put( aFontItemCJK );
++
++ SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
++ aItems.Put( aFontItemCTL );
+ }
+
+ pImpEditEngine->SetParaAttribs( nNode, aItems );
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 4c13e38..ee0df58 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
%define oootag OOO330
-%define ooomilestone 8
-%define rh_rpm_release 4
+%define ooomilestone 9
+%define rh_rpm_release 1
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -119,6 +119,7 @@ Patch40: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
Patch41: workspace.cmcfixes79.patch
Patch42: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
Patch43: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
+Patch44: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1650,6 +1651,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch41 -p1 -b .workspace.cmcfixes79.patch
%patch42 -p1 -b .ooo114703.vcl.betterlocalize.font.patch
%patch43 -p1 -b .rh637738.libgcrypt.addmutex.patch
+%patch44 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3848,6 +3850,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
%endif
%changelog
+* Tue Sep 28 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-9.1
+- Resolves: rhbz#638185 cjk/ctl font sizes wrong in impress
+
* Mon Sep 27 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-8.4
- Resolves: rhbz#637738 threading problems with using libgcrypt via neon when
libgcrypt which was initialized by cups to be non-thread safe
diff --git a/sources b/sources
index 92c5369..8733134 100644
--- a/sources
+++ b/sources
@@ -16,4 +16,4 @@ f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
5d4db996b3fe3169bb3cc6af22aec605 description.xml
22be99cb6dbf147543154099d3db0dfa manifest.xml
0dd1d333fe555f9bec2ef4d623b69e7d redhat-langpacks.tar.gz
-0fb07700099e1c210fd8cf3eaa513b1d OOO330_m8.tar.bz2
+f138ca2c975e3cd14abcc80408f31045 OOO330_m9.tar.bz2
More information about the scm-commits
mailing list