summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 12:48:44 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 12:48:44 +0200
commit2fc4a8c8113b1bf78258845ed06662a07996a6af (patch)
treedb055018db2d6190438b451444f337215a76917f /xmloff
parent7ea8046c741c8b7b608f26e312cc5f1056752c09 (diff)
Add support for cppu::UnoType<void>
Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/forms/propertyimport.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index ceda8bde9e4a..3aa6200f2976 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -234,7 +234,7 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe
Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
{
- Type aUnoType( cppu::UnoType<cppu::UnoVoidType>::get() );
+ Type aUnoType( cppu::UnoType<void>::get() );
static std::map< OUString, css::uno::Type > s_aTypeNameMap;
if ( s_aTypeNameMap.empty() )
@@ -247,7 +247,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
// C++ type "float" to "double" makes absolute sense
s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::cppu::UnoType<double>::get();
s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::cppu::UnoType<OUString>::get();
- s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = cppu::UnoType<cppu::UnoVoidType>::get();
+ s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = cppu::UnoType<void>::get();
}
const std::map< OUString, css::uno::Type >::iterator aTypePos = s_aTypeNameMap.find( _rType );