[Libreoffice-commits] core.git: 3 commits - dbaccess/source vcl/quartz

[Herbert Dürr]

 dbaccess/source/core/api/TableDeco.cxx |    1 +
 dbaccess/source/ui/dlg/sqlmessage.cxx  |    2 +-
 vcl/quartz/ctfonts.cxx                 |    6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3e99ab21d389e12b5fca3ef6828a8cded49489ec
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Jan 28 13:31:31 2014 +0000

    Resolves: #i124121# prevent italic emulation with ITALIC_DONTKNOW fonts
    
    (cherry picked from commit a8cd1fab9a17df6179c31e1a73816f1bcd627a9b)
    
    Conflicts:
    	vcl/aqua/source/gdi/ctfonts.cxx
    
    Change-Id: Ib2893a0ce119ac56ac7091fd18a652fe990e82ec

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index ea4cdad..fffd680 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -74,7 +74,9 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
     CFDictionarySetValue( mpStyleDict, kCTVerticalFormsAttributeName, pCFVertBool );
 
     // fake bold
-    if ((pReqFont->GetWeight() >= WEIGHT_BOLD) && (mpFontData->GetWeight() < WEIGHT_SEMIBOLD))
+    if ( (pReqFont->GetWeight() >= WEIGHT_BOLD) &&
+         ((mpFontData->GetWeight() < WEIGHT_SEMIBOLD) &&
+          (mpFontData->GetWeight() != WEIGHT_DONTKNOW)) )
     {
         int nStroke = -10.0;
         CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke);
@@ -83,7 +85,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
 
     // fake italic
     if (((pReqFont->GetSlant() == ITALIC_NORMAL) || (pReqFont->GetSlant() == ITALIC_OBLIQUE))
-    && !((mpFontData->GetSlant() == ITALIC_NORMAL) || (mpFontData->GetSlant() == ITALIC_OBLIQUE)))
+    && (mpFontData->GetSlant() == ITALIC_NONE))
     {
         aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, toRadian(120), 1, 0, 0));
     }
commit f244845c89ac72bfd4b878a88a3b5c131df71d3f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 28 15:14:21 2014 +0000

    coverity#705144 Missing break in switch
    
    Change-Id: Ie3c28d7172ec17ed7de6033c6eada6fb66d1cdf2

diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 7bdd172..d8ce769 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -555,7 +555,7 @@ void OSQLMessageBox::impl_initImage( MessageType _eImage )
     {
         default:
             OSL_FAIL( "OSQLMessageBox::impl_initImage: unsupported image type!" );
-
+            /* Fall through */
         case Info:
             m_aInfoImage.SetImage(InfoBox::GetStandardImage());
             break;
commit d786af6820175e10323a4662b8b68e9510c80b80
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 28 15:12:43 2014 +0000

    coverity#705141 Missing break in switch
    
    Change-Id: I9b94f1056fa62b2c0c609f6d448e1750bb0e9ce5

diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 9d94317..8f9ae64 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -171,6 +171,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
     {
         case PROPERTY_ID_PRIVILEGES:
             SAL_WARN("dbaccess", "Property is readonly!");
+            /* Fall through */
         case PROPERTY_ID_FILTER:
         case PROPERTY_ID_ORDER:
         case PROPERTY_ID_APPLYFILTER: