[Libreoffice-commits] core.git: 2 commits - editeng/source include/sfx2

[Caolán McNamara]

 editeng/source/items/textitem.cxx |    7 ++-----
 include/sfx2/app.hxx              |    5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit f736175749bd030e1f8473e84ee070b9cc4eef3b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 7 09:34:58 2017 +0000

    Resolves: coverity#1402073 Mixing enum types
    
    Change-Id: Ifb8ca51cd8937b740c810083b45d5e7fbb06d91f

diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2b62129..2a21c0c 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -513,7 +513,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
             rVal <<= (bool)GetBoolValue();
             break;
         case MID_POSTURE:
-            rVal <<= (awt::FontSlant)GetValue();    // values from awt::FontSlant and FontItalic are equal
+            rVal <<= VCLUnoHelper::ConvertFontSlant(GetValue());
             break;
     }
     return true;
@@ -538,25 +538,22 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 
                 eSlant = (awt::FontSlant)nValue;
             }
-            SetValue((FontItalic)eSlant);
+            SetValue(VCLUnoHelper::ConvertFontSlant(eSlant));
         }
     }
     return true;
 }
 
-
 bool SvxPostureItem::HasBoolValue() const
 {
     return true;
 }
 
-
 bool SvxPostureItem::GetBoolValue() const
 {
     return ( GetValue() >= ITALIC_OBLIQUE );
 }
 
-
 void SvxPostureItem::SetBoolValue( bool bVal )
 {
     SetValue( bVal ? ITALIC_NORMAL : ITALIC_NONE );
commit a32e5162bc5719fc37ba4a9831bc063a097c4d02
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 7 09:16:31 2017 +0000

    make SfxApplication ctor private
    
    Change-Id: I85d2a112b1f7e6215480d89e038d6515d641d147

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 74d2900..6bed28c 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -128,11 +128,10 @@ public:
 private:
     /// SfxInterface initializer.
     static void InitInterface_Impl();
+    SfxApplication();
 
 public:
-
-                                SfxApplication();
-                                virtual ~SfxApplication() override;
+    virtual ~SfxApplication() override;
     static SfxApplication*      GetOrCreate();
     static SfxApplication*      Get();