[Libreoffice-commits] core.git: sw/source

[Noel Grandin]

 sw/source/core/inc/swfont.hxx     |    4 ++--
 sw/source/core/txtnode/swfont.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c8fd5210b638fca6b20f4884f00f314eeca67b56
Author: Noel Grandin <n...@peralex.com>
Date:   Thu Mar 31 13:45:16 2016 +0200

    fix MSVC build
    
    after commit 41bdaa37cc62f656cc164992c4c7d39bec7e57e2
    "tdf#84938 convert SW_* script constants to scoped enum"
    
    o3tl::enumarray and MSVC does not like classes with private constructors
    
    Change-Id: Id954ecb6100b0a51c25b4405e322d20c37e09fea

diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 8070d1e..c684a96 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -57,8 +57,6 @@ class SwSubFont : public SvxFont
     sal_uInt16      m_nOrgAscent;     // ascent including escapement/proportion
     sal_uInt16      m_nProportionalWidth;     // proportional width
     bool m_bSmallCapsPercentage66;
-    inline SwSubFont() : m_aSize(0,0)
-    { m_pMagic = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0; 
m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
 
     sal_uInt16 CalcEscAscent( const sal_uInt16 nOldAscent ) const;
     sal_uInt16 CalcEscHeight( const sal_uInt16 nOldHeight,
@@ -115,6 +113,8 @@ class SwSubFont : public SvxFont
     inline void SetPropWidth( const sal_uInt16 nNew )
         { m_pMagic = nullptr; m_nProportionalWidth = nNew; }
 public:
+    inline SwSubFont() : m_aSize(0,0)
+    { m_pMagic = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0; 
m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
     sal_uInt16 GetPropWidth() const { return m_nProportionalWidth; }
 };
 
diff --git a/sw/source/core/txtnode/swfont.cxx 
b/sw/source/core/txtnode/swfont.cxx
index b92dccc..7d72689 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -739,7 +739,7 @@ SwFont::SwFont( const SwFont &rFont )
 
 SwFont::SwFont( const SwAttrSet* pAttrSet,
                 const IDocumentSettingAccess* pIDocumentSettingAccess )
-    : m_aSub { SwSubFont(), SwSubFont(), SwSubFont() }
+    : m_aSub()
 {
     m_nActual = SwFontScript::Latin;
     m_nToxCount = 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits