diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/xdash.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/font/Feature.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmltkmap.hxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx index e415e8b4dc19..ef28add1debd 100644 --- a/include/svx/xdash.hxx +++ b/include/svx/xdash.hxx @@ -33,8 +33,8 @@ class SVX_DLLPUBLIC XDash final { css::drawing::DashStyle eDash; - sal_uInt16 nDots; sal_uInt32 nDotLen; + sal_uInt16 nDots; sal_uInt16 nDashes; sal_uInt32 nDashLen; sal_uInt32 nDistance; diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx index 390abe33f8b7..47092f9bb56e 100644 --- a/include/vcl/font/Feature.hxx +++ b/include/vcl/font/Feature.hxx @@ -56,10 +56,10 @@ public: class VCL_DLLPUBLIC FeatureDefinition { private: - uint32_t m_nCode; OUString m_sDescription; const char* m_pDescriptionID; OUString m_sNumericPart; + uint32_t m_nCode; FeatureParameterType m_eType; // the index of the parameter defines the enum value, string is the description std::vector<FeatureParameter> m_aEnumParameters; diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx index 1bed470c2535..df4de8e4848f 100644 --- a/include/xmloff/xmltkmap.hxx +++ b/include/xmloff/xmltkmap.hxx @@ -34,17 +34,17 @@ class SvXMLTokenMap_Impl; struct SvXMLTokenMapEntry { - sal_uInt16 const nPrefixKey; enum xmloff::token::XMLTokenEnum const eLocalName; - sal_uInt16 const nToken; sal_Int32 nFastToken; + sal_uInt16 const nPrefixKey; + sal_uInt16 const nToken; SvXMLTokenMapEntry( sal_uInt16 nPrefix, xmloff::token::XMLTokenEnum eName, sal_uInt16 nTok, sal_Int32 nFastTok = 0 ) : - nPrefixKey( nPrefix ), eLocalName( eName ), - nToken( nTok ), - nFastToken( sal_uInt32( nPrefixKey + 1 ) << 16 | eLocalName ) + nFastToken( sal_uInt32( nPrefix + 1 ) << 16 | eLocalName ), + nPrefixKey( nPrefix ), + nToken( nTok ) { if ( nFastTok ) // alternative value for duplicate/dummy tokens nFastToken = nFastTok; |