diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 17:21:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:06 +0200 |
| commit | d0b17e6ed881fbfbf35a851f9fe876e1846b5ce6 (patch) | |
| tree | 8376ccad9f6989c1ae76d15466997117970cc4ce | |
| parent | 9d56ec4e4d498193b6553c5a8c65ddce88a2d925 (diff) | |
SvXMLEnumMapEntry holds all values as sal_uInt16
Change-Id: I3af5f97e77240a0f0a3c96cffc03c8a005e8f0aa
| -rw-r--r-- | dbaccess/source/filter/xml/xmlHelper.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index fcbdbc474fee..43a7fecffdfe 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -56,8 +56,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { static const SvXMLEnumMapEntry aDisplayMap[] = { - { XML_VISIBLE, sal_True }, - { XML_COLLAPSE, sal_False }, + { XML_VISIBLE, sal_uInt16(true) }, + { XML_COLLAPSE, sal_uInt16(false) }, { XML_TOKEN_INVALID, 0 } }; m_pDisplayHandler.reset(new XMLConstantsPropertyHandler(aDisplayMap, XML_TOKEN_INVALID )); diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d5a44c37d84e..a422b2588d20 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -322,15 +322,15 @@ static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] = static const SvXMLEnumMapEntry aStyleValueMap[] = { - { XML_SHORT, sal_False }, - { XML_LONG, sal_True }, + { XML_SHORT, sal_uInt16(false) }, + { XML_LONG, sal_uInt16(true) }, { XML_TOKEN_INVALID, 0 } }; static const SvXMLEnumMapEntry aFormatSourceMap[] = { - { XML_FIXED, sal_False }, - { XML_LANGUAGE, sal_True }, + { XML_FIXED, sal_uInt16(false) }, + { XML_LANGUAGE, sal_uInt16(true) }, { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index d39aa776c6e0..0cc3464bf359 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -124,13 +124,13 @@ static SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] = static SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] = { - { XML_FROM_LEFT, sal_False }, - { XML_FROM_INSIDE, sal_True }, - { XML_LEFT, sal_False }, - { XML_INSIDE, sal_True }, - { XML_CENTER, sal_False }, - { XML_RIGHT, sal_False }, - { XML_OUTSIDE, sal_True }, + { XML_FROM_LEFT, sal_uInt16(false) }, + { XML_FROM_INSIDE, sal_uInt16(true) }, + { XML_LEFT, sal_uInt16(false) }, + { XML_INSIDE, sal_uInt16(true) }, + { XML_CENTER, sal_uInt16(false) }, + { XML_RIGHT, sal_uInt16(false) }, + { XML_OUTSIDE, sal_uInt16(true) }, { XML_TOKEN_INVALID, 0 } }; |