diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-08 11:32:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-09 13:03:06 +0100 |
| commit | 3912e47044f753f82c63ac11e803be5fb756c14f (patch) | |
| tree | 87d9bb88027876ef0528218d712de5305e651f55 /reportdesign | |
| parent | 52c5eb20fd96d63e17cb9cd18912030131bcc787 (diff) | |
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlControlProperty.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index c5929c2a4a97..f3fbc12d5493 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + +#include <map> + #include "xmlControlProperty.hxx" #include <rtl/strbuf.hxx> @@ -80,8 +84,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport case XML_TOK_VALUE_TYPE: { // needs to be translated into a ::com::sun::star::uno::Type - DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Type, MapString2Type ); - static MapString2Type s_aTypeNameMap; + static std::map< OUString, css::uno::Type > s_aTypeNameMap; if (!s_aTypeNameMap.size()) { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); @@ -95,7 +98,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } - const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); + const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue); OSL_ENSURE(s_aTypeNameMap.end() != aTypePos, "OXMLControlProperty::OXMLControlProperty: invalid type!"); if (s_aTypeNameMap.end() != aTypePos) m_aPropType = aTypePos->second; |