[libreoffice/f19] fix patch
Caolán McNamara
caolanm at fedoraproject.org
Wed Dec 4 15:56:34 UTC 2013
commit 46ac5cbefe884f88502e9c360cee9e4b56b6fc5f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 4 15:52:14 2013 +0000
fix patch
...bz-912529-Kerkis-SmallCaps-shown-instead-.patch | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch b/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
index aa68715..5300507 100644
--- a/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
+++ b/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
@@ -17,20 +17,12 @@ diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index c27cd93..f3f5a77 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
-@@ -665,7 +665,7 @@ PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagi
-
- sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) const
- {
-- // compare their width, weight, italic and style name
-+ // compare their width, weight, italic, style name and family name
- if( GetWidthType() < rOther.GetWidthType() )
- return -1;
- else if( GetWidthType() > rOther.GetWidthType() )
-@@ -681,7 +681,14 @@ sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther )
+@@ -718,8 +718,14 @@
else if( GetSlant() > rOther.GetSlant() )
- return 1;
+ return COMPARE_GREATER;
-- return GetFamilyName().compareTo( rOther.GetFamilyName() );
+- sal_Int32 eCompare = GetFamilyName().compareTo( rOther.GetFamilyName() );
+- return eCompare;
+ sal_Int32 nRet = GetFamilyName().compareTo( rOther.GetFamilyName() );
+
+ if (nRet == 0)
@@ -42,6 +34,3 @@ index c27cd93..f3f5a77 100644
}
sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace& rOther ) const
---
-1.8.3.1
-
More information about the scm-commits
mailing list