summaryrefslogtreecommitdiff
path: root/dbaccess
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 /dbaccess
parent7ea8046c741c8b7b608f26e312cc5f1056752c09 (diff)
Add support for cppu::UnoType<void>
Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 847c02e925a7..72129d42922f 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -94,7 +94,7 @@ struct AsciiPropertyValue
AsciiPropertyValue()
:DefaultValue( )
,AsciiName( NULL )
- ,ValueType( ::cppu::UnoType< ::cppu::UnoVoidType >::get() )
+ ,ValueType( ::cppu::UnoType<void>::get() )
{
}
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index abf40abf022e..c547560983f3 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -48,7 +48,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
,m_bIsList(false)
{
- m_aPropType = cppu::UnoType<cppu::UnoVoidType>::get();
+ m_aPropType = cppu::UnoType<void>::get();
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -80,7 +80,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::cppu::UnoType<OUString>::get();
s_aTypeNameMap[GetXMLToken( XML_INT)] = ::cppu::UnoType<sal_Int32>::get();
s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::cppu::UnoType<sal_Int16>::get();
- s_aTypeNameMap[GetXMLToken( XML_VOID)] = cppu::UnoType<cppu::UnoVoidType>::get();
+ s_aTypeNameMap[GetXMLToken( XML_VOID)] = cppu::UnoType<void>::get();
}
const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);