diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-31 13:45:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-31 13:50:19 +0200 |
| commit | c8fd5210b638fca6b20f4884f00f314eeca67b56 (patch) | |
| tree | e393a08c3769949892624c5a89528aa77f5f4c0a /sw | |
| parent | 9fa87bb1a42c45446f78b4d8c8096d7ce90a8022 (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/inc/swfont.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 8070d1e2f4cc..c684a9643ee2 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 b92dccc8ad58..7d7268917b05 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; |