summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/misc/stillreadwriteinteraction.cxx6
-rw-r--r--cppu/qa/test_unotype.cxx30
-rw-r--r--editeng/source/uno/unopracc.cxx10
-rw-r--r--filter/source/config/cache/configflush.cxx6
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx144
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--ucb/source/ucp/file/filid.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx6
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.cxx6
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx12
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx15
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx21
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx15
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx15
-rw-r--r--ucbhelper/source/provider/interactionrequest.cxx50
-rw-r--r--ucbhelper/source/provider/resultsetmetadata.cxx16
-rw-r--r--xmlhelp/source/cxxhelp/provider/contentcaps.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx10
18 files changed, 161 insertions, 209 deletions
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index 1d74d8ffcf7b..10f1855e5bd4 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -37,13 +37,13 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
aInterceptedRequest.Handle = HANDLE_INTERACTIVEIOEXCEPTION;
aInterceptedRequest.Request <<= css::ucb::InteractiveIOException();
- aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
+ aInterceptedRequest.Continuation = cppu::UnoType<css::task::XInteractionAbort>::get();
aInterceptedRequest.MatchExact = false;
lInterceptions.push_back(aInterceptedRequest);
aInterceptedRequest.Handle = HANDLE_UNSUPPORTEDDATASINKEXCEPTION;
aInterceptedRequest.Request <<= css::ucb::UnsupportedDataSinkException();
- aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0));
+ aInterceptedRequest.Continuation = cppu::UnoType<css::task::XInteractionAbort>::get();
aInterceptedRequest.MatchExact = false;
lInterceptions.push_back(aInterceptedRequest);
@@ -108,7 +108,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction:
m_bHandledByMySelf = true;
css::uno::Reference< css::task::XInteractionContinuation > xAbort = ::ucbhelper::InterceptedInteraction::extractContinuation(
xRequest->getContinuations(),
- ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0)));
+ cppu::UnoType<css::task::XInteractionAbort>::get() );
if (!xAbort.is())
return ::ucbhelper::InterceptedInteraction::E_NO_CONTINUATION_FOUND;
xAbort->select();
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 9a3e89704eb2..bbea20099e15 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -282,25 +282,25 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::UnoType< bool >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< bool * >(0)) ==
- ::getCppuType(static_cast< bool * >(0)));
+ ::cppu::UnoType<bool>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< sal_Bool * >(0)) ==
::cppu::UnoType< bool >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< sal_Bool * >(0)) ==
- ::getCppuType(static_cast< sal_Bool * >(0)));
+ ::cppu::UnoType<sal_Bool>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int8 * >(0)) ==
::cppu::UnoType< ::sal_Int8 >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int8 * >(0)) ==
- ::getCppuType(static_cast< ::sal_Int8 * >(0)));
+ ::cppu::UnoType<sal_Int8>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int16 * >(0)) ==
::cppu::UnoType< ::sal_Int16 >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int16 * >(0)) ==
- ::getCppuType(static_cast< ::sal_Int16 * >(0)));
+ ::cppu::UnoType<sal_Int16>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< ::cppu::UnoUnsignedShortType * >(0)) ==
@@ -316,19 +316,19 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::UnoType< ::sal_Int32 >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int32 * >(0)) ==
- ::getCppuType(static_cast< ::sal_Int32 * >(0)));
+ ::cppu::UnoType<sal_Int32>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt32 * >(0)) ==
::cppu::UnoType< ::sal_uInt32 >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt32 * >(0)) ==
- ::getCppuType(static_cast< ::sal_uInt32 * >(0)));
+ ::cppu::UnoType<sal_uInt32>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int64 * >(0)) ==
::cppu::UnoType< ::sal_Int64 >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int64 * >(0)) ==
- ::getCppuType(static_cast< ::sal_Int64 * >(0)));
+ ::cppu::UnoType<sal_Int64>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt64 * >(0)) ==
::cppu::UnoType< ::sal_uInt64 >::get());
@@ -340,13 +340,13 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::UnoType< float >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< float * >(0)) ==
- ::getCppuType(static_cast< float * >(0)));
+ ::cppu::UnoType<float>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< double * >(0)) ==
::cppu::UnoType< double >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< double * >(0)) ==
- ::getCppuType(static_cast< double * >(0)));
+ ::cppu::UnoType<double>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< ::cppu::UnoCharType * >(0)) ==
@@ -362,7 +362,7 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::UnoType< ::rtl::OUString >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< ::rtl::OUString * >(0)) ==
- ::getCppuType(static_cast< ::rtl::OUString * >(0)));
+ ::cppu::UnoType<rtl::OUString>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< css::uno::Type * >(0)) ==
::cppu::UnoType< css::uno::Type >::get());
@@ -446,7 +446,7 @@ void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< css::lang::EventObject * >(0)) ==
- ::getCppuType(static_cast< css::lang::EventObject * >(0)));
+ ::cppu::UnoType<css::lang::EventObject>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct1 * >(0)) ==
::cppu::UnoType< css::lang::EventObject >::get());
@@ -460,7 +460,7 @@ void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< css::beans::PropertyChangeEvent * >(0)) ==
- ::getCppuType(static_cast< css::beans::PropertyChangeEvent * >(0)));
+ ::cppu::UnoType<css::beans::PropertyChangeEvent>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct2 * >(0)) ==
::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
@@ -482,7 +482,7 @@ void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< css::uno::Exception * >(0)) ==
- ::getCppuType(static_cast< css::uno::Exception * >(0)));
+ ::cppu::UnoType<css::uno::Exception>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedException1 * >(0)) ==
::cppu::UnoType< css::uno::Exception >::get());
@@ -536,9 +536,7 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast<
css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
- ::getCppuType(
- static_cast<
- css::uno::Reference< css::uno::XComponentContext > * >(0)));
+ cppu::UnoType<css::uno::XComponentContext>::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedInterface2 * >(0)) ==
::cppu::UnoType< css::uno::XComponentContext >::get());
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index be290bd007bf..e0d082f1aae7 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -86,11 +86,11 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
- ::getCppuType( static_cast< const uno::Reference< beans::XPropertySet >* > (0) ),
- ::getCppuType( static_cast< const uno::Reference< beans::XMultiPropertySet >* > (0) ),
- ::getCppuType( static_cast< const uno::Reference< beans::XPropertyState >* > (0) ),
- ::getCppuType( static_cast< const uno::Reference< lang::XServiceInfo >* > (0) ),
- ::getCppuType( static_cast< const uno::Reference< lang::XTypeProvider >* > (0) ) );
+ ::cppu::UnoType<beans::XPropertySet>::get(),
+ ::cppu::UnoType<beans::XMultiPropertySet>::get(),
+ ::cppu::UnoType<beans::XPropertyState>::get(),
+ ::cppu::UnoType<lang::XServiceInfo>::get(),
+ ::cppu::UnoType<lang::XTypeProvider>::get() );
// ... and set his address to static pointer!
pTypeCollection = &aTypeCollection ;
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index b2815981af12..595efe44af4a 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -65,7 +65,7 @@ void SAL_CALL ConfigFlush::refresh()
// Further its not a good idea to hold the own lock
// if an outside object is called :-)
css::lang::EventObject aSource (static_cast< css::util::XRefreshable* >(this));
- ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(::getCppuType(static_cast< css::uno::Reference< css::util::XRefreshListener >* >(NULL)));
+ ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XRefreshListener>::get());
if (pContainer)
{
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -94,7 +94,7 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut
{
// no locks necessary
// used helper lives if we live and is threadsafe by itself ...
- m_lListener.addInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XRefreshListener >* >(NULL)),
+ m_lListener.addInterface(cppu::UnoType<css::util::XRefreshListener>::get(),
xListener);
}
@@ -104,7 +104,7 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css:
{
// no locks necessary
// used helper lives if we live and is threadsafe by itself ...
- m_lListener.removeInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XRefreshListener >* >(NULL)),
+ m_lListener.removeInterface(cppu::UnoType<css::util::XRefreshListener>::get(),
xListener);
}
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 2eaff038ae29..0fc0515d2284 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -302,88 +302,88 @@ OStyle::OStyle()
const sal_Int32 nMayBeVoid = beans::PropertyAttribute::MAYBEVOID;
sal_Int32 i = 0;
- registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< OUString *>(NULL) ), &sName );
+ registerPropertyNoMember( PROPERTY_NAME, ++i, nBound, cppu::UnoType<OUString>::get(), &sName );
- registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
+ registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nTransparent);
- registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
+ registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound, cppu::UnoType<style::GraphicLocation>::get(), &eGraphicLocation);
registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nMargin);
- registerPropertyNoMember("DisplayName", ++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
- registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
- registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
- registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL, ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nMargin);
+ registerPropertyNoMember("DisplayName", ++i,nBound, cppu::UnoType<OUString>::get(), &sEmpty);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nTransparent);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound, cppu::UnoType<OUString>::get(), &sEmpty);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound, cppu::UnoType<style::GraphicLocation>::get(), &eGraphicLocation);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL, ++i,nBound, cppu::UnoType<OUString>::get(), &sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, ++i,nBound,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC, ++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_FTRON, ++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED, ++i,nBound,::getBooleanCppuType() ,&bFalse);
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW, ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
-
- registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
- registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
- registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
- registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL, ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW, ++i,nBound, cppu::UnoType<table::ShadowFormat>::get(), &eShadowFormat);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
+
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nTransparent);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid, cppu::UnoType<OUString>::get(), &sEmpty);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid, cppu::UnoType<style::GraphicLocation>::get(), &eGraphicLocation);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL, ++i,nBound|nMayBeVoid, cppu::UnoType<OUString>::get(), &sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBOR, ++i,nBound|nMayBeVoid, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_HDRDYNAMIC, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_HDRON, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_HDRSHARED, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW, ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBOR, ++i,nBound|nMayBeVoid, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBOR, ++i,nBound|nMayBeVoid, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW, ++i,nBound|nMayBeVoid, cppu::UnoType<table::ShadowFormat>::get(), &eShadowFormat);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR, ++i,nBound|nMayBeVoid, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), &nZero);
registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::cppu::UnoType<sal_Int32>::get() );
registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse);
- registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound, ::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound, ::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::cppu::UnoType<sal_Int32>::get(), &nMargin);
- registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType);
- registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout);
+ registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound, cppu::UnoType<sal_Int16>::get(), &nNummeringType);
+ registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound, cppu::UnoType<sal_Int16>::get(), &n16Zero);
+ registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound, cppu::UnoType<style::PageStyleLayout>::get(), &ePageStyleLayout);
const OUString sPaperTray("[From printer settings]");
- registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound,::getCppuType((const OUString*)0) ,&sPaperTray);
- registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound, cppu::UnoType<OUString>::get(), &sPaperTray);
+ registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound, cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get(), &nMargin);
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOX, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOY, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- registerPropertyNoMember(SC_UNO_PAGE_SHADOWFORM, ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) );
- registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG, ++i,nBound, cppu::UnoType<sal_Int16>::get(), &n16Zero);
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOX, ++i,nBound, cppu::UnoType<sal_Int16>::get(), &n16Zero);
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOY, ++i,nBound, cppu::UnoType<sal_Int16>::get(), &n16Zero);
+ registerPropertyNoMember(SC_UNO_PAGE_SHADOWFORM, ++i,nBound, cppu::UnoType<table::ShadowFormat>::get(), &eShadowFormat);
+ registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize, cppu::UnoType<awt::Size>::get() );
+ registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), &eBorderLine);
registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nMargin);
- uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL)));
- registerPropertyNoMember("UserDefinedAttributes", ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs);
- registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::cppu::UnoType<sal_Int32>::get() );
- registerPropertyNoMember("PrinterName", ++i,nBound,::getCppuType((const OUString*)0),&sEmpty);
+ uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(cppu::UnoType<xml::AttributeData>::get());
+ registerPropertyNoMember("UserDefinedAttributes", ++i,nBound, cppu::UnoType<container::XNameContainer>::get(), &xAttribs);
+ registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width, cppu::UnoType<sal_Int32>::get() );
+ registerPropertyNoMember("PrinterName", ++i,nBound, cppu::UnoType<OUString>::get(), &sEmpty);
uno::Sequence<sal_Int8> aSe;
registerPropertyNoMember("PrinterSetup", ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
@@ -1455,10 +1455,10 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
/** property map for export info set */
comphelper::PropertyMapEntry const aExportInfoMap[] =
{
- { OUString("UsePrettyPrinting") , 0, ::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("StreamName") , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("StreamRelPath") , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("BaseURI") , 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("UsePrettyPrinting") , 0, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamName") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamRelPath") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("BaseURI") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
@@ -2312,7 +2312,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
else if ( aServiceSpecifier == "com.sun.star.xml.NamespaceMap" )
{
if ( !m_pImpl->m_xXMLNamespaceMap.is() )
- m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( ::getCppuType( (const OUString*) 0 ) ).get();
+ m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( cppu::UnoType<OUString>::get() ).get();
return m_pImpl->m_xXMLNamespaceMap;
}
else
@@ -2421,7 +2421,7 @@ class OStylesHelper:
protected:
virtual ~OStylesHelper(){}
public:
- OStylesHelper(const uno::Type _aType = ::getCppuType(static_cast< uno::Reference< container::XElementAccess >* >(NULL)));
+ OStylesHelper(const uno::Type _aType = cppu::UnoType<container::XElementAccess>::get());
// XNameContainer
virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -2550,17 +2550,17 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam
m_pImpl->m_xStyles = new OStylesHelper();
uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY);
- uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
+ uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
xStyles->insertByName(OUString("PageStyles"),uno::makeAny(xPageStyles));
uno::Reference< style::XStyle> xPageStyle(createInstance("com.sun.star.style.PageStyle"),uno::UNO_QUERY);
xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle));
- uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
+ uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
xStyles->insertByName(OUString("FrameStyles"),uno::makeAny(xFrameStyles));
uno::Reference< style::XStyle> xFrameStyle(createInstance("com.sun.star.style.FrameStyle"),uno::UNO_QUERY);
xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle));
- uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
+ uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
xStyles->insertByName(OUString("graphics"),uno::makeAny(xGraphicStyles));
uno::Reference< style::XStyle> xGraphicStyle(createInstance("com.sun.star.style.GraphicStyle"),uno::UNO_QUERY);
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle));
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index f04e35d9a498..28127df226e3 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -87,7 +87,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType();
s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType<double>::get();
s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::cppu::UnoType<double>::get();
- s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::cppu::UnoType<OUString>::get();
s_aTypeNameMap[GetXMLToken( XML_INT)] = ::cppu::UnoType<sal_Int32>::get();
s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) );
s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) );
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 383589ef7cc2..8351810f40a7 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -99,8 +99,8 @@ FileContentIdentifier::getTypes(
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast< uno::Reference< lang::XTypeProvider >* >( 0 ) ),
- getCppuType( static_cast< uno::Reference< XContentIdentifier >* >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<XContentIdentifier>::get() );
pCollection = &collection;
}
}
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 8e4aa4e993bf..8b6cb3fed130 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -148,14 +148,12 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuType(
- static_cast< ucb::InsertCommandArgument * >( 0 ) )
+ cppu::UnoType<ucb::InsertCommandArgument>::get()
),
ucb::CommandInfo(
OUString( "delete" ),
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 8e12847fc34e..07051ab758e9 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -98,9 +98,9 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast< css::uno::Reference< XTypeProvider >*>(0) ),
- getCppuType( static_cast< css::uno::Reference< XServiceInfo>*> (0) ),
- getCppuType( static_cast< css::uno::Reference< XContentProvider>*> (0) )
+ cppu::UnoType<XTypeProvider>::get(),
+ cppu::UnoType<XServiceInfo>::get(),
+ cppu::UnoType<XContentProvider>::get()
);
pCollection = &collection;
}
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 67bdb2d1cc1d..564bafe3af70 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -535,8 +535,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
@@ -590,8 +589,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
@@ -654,8 +652,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
@@ -699,8 +696,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index 2e81cb493a3a..54b4cbe1a2aa 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -363,14 +363,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType(
- static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
@@ -442,14 +440,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType(
- static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
@@ -521,8 +517,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 5e0cce07f5bd..f3a00c3fbf6c 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -212,8 +212,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Storage" ),
-1,
- getCppuType( static_cast<
- const uno::Reference< embed::XStorage > * >( 0 ) ),
+ cppu::UnoType<embed::XStorage>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -279,8 +278,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "DocumentModel" ),
-1,
- getCppuType( static_cast<
- const uno::Reference< frame::XModel > * >( 0 ) ),
+ cppu::UnoType<frame::XModel>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -410,8 +408,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
@@ -470,8 +467,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
@@ -531,8 +527,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
@@ -592,8 +587,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
),
ucb::CommandInfo(
OUString( "transfer" ),
@@ -655,8 +649,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType(
- static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
// New commands
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 8d040ce38ae6..f052e06d5755 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -563,14 +563,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuType( static_cast<
- ucb::InsertCommandArgument * >( 0 ) ) );
+ cppu::UnoType<ucb::InsertCommandArgument>::get() );
aCmdInfo[ 6 ] =
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType( static_cast<
- ucb::OpenCommandArgument2 * >( 0 ) ) );
+ cppu::UnoType<ucb::OpenCommandArgument2>::get() );
// New commands
@@ -580,20 +578,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "post" ),
-1,
- getCppuType( static_cast<
- ucb::PostCommandArgument2 * >( 0 ) ) );
+ cppu::UnoType<ucb::PostCommandArgument2>::get() );
aCmdInfo[ 8 ] =
ucb::CommandInfo(
OUString( "addProperty" ),
-1,
- getCppuType( static_cast<
- ucb::PropertyCommandArgument * >( 0 ) ) );
+ cppu::UnoType<ucb::PropertyCommandArgument>::get() );
aCmdInfo[ 9 ] =
ucb::CommandInfo(
OUString( "removeProperty" ),
-1,
- getCppuType( static_cast<
- rtl::OUString * >( 0 ) ) );
+ cppu::UnoType<rtl::OUString>::get() );
bool bFolder = false;
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index a68231e082fb..f5feb22cd9ec 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -535,14 +535,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuType( static_cast<
- ucb::InsertCommandArgument * >( 0 ) ) );
+ cppu::UnoType<ucb::InsertCommandArgument>::get() );
aCmdInfo[ 6 ] =
ucb::CommandInfo(
OUString( "open" ),
-1,
- getCppuType( static_cast<
- ucb::OpenCommandArgument2 * >( 0 ) ) );
+ cppu::UnoType<ucb::OpenCommandArgument2>::get() );
// New commands
@@ -552,20 +550,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "post" ),
-1,
- getCppuType( static_cast<
- ucb::PostCommandArgument2 * >( 0 ) ) );
+ cppu::UnoType<ucb::PostCommandArgument2>::get() );
aCmdInfo[ 8 ] =
ucb::CommandInfo(
OUString( "addProperty" ),
-1,
- getCppuType( static_cast<
- ucb::PropertyCommandArgument * >( 0 ) ) );
+ cppu::UnoType<ucb::PropertyCommandArgument>::get() );
aCmdInfo[ 9 ] =
ucb::CommandInfo(
OUString( "removeProperty" ),
-1,
- getCppuType( static_cast<
- rtl::OUString * >( 0 ) ) );
+ cppu::UnoType<rtl::OUString>::get() );
sal_Bool bFolder = sal_False;
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 59b1f029a1ab..c1d46179df7a 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -162,10 +162,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionRequest > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionRequest>::get() );
pCollection = &collection;
}
}
@@ -304,10 +302,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionAbort > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionAbort>::get() );
pCollection = &collection;
}
}
@@ -396,10 +392,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionRetry > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionRetry>::get() );
pCollection = &collection;
}
}
@@ -488,10 +482,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionApprove > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionApprove>::get() );
pCollection = &collection;
}
}
@@ -580,10 +572,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionDisapprove > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionDisapprove>::get() );
pCollection = &collection;
}
}
@@ -674,11 +664,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference<
- ucb::XInteractionSupplyAuthentication2 > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<ucb::XInteractionSupplyAuthentication2>::get() );
pCollection = &collection;
}
}
@@ -928,10 +915,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< ucb::XInteractionSupplyName > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<ucb::XInteractionSupplyName>::get() );
pCollection = &collection;
}
}
@@ -1035,11 +1020,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference<
- ucb::XInteractionReplaceExistingData > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<ucb::XInteractionReplaceExistingData>::get() );
pCollection = &collection;
}
}
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 1dffea6beab0..ed9339e4c981 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -462,23 +462,23 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
nType = DataType::BIT; // XRow::getBoolean
else if ( rType == cppu::UnoType<sal_Int32>::get() )
nType = DataType::INTEGER; // XRow::getInt
- else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int64>::get() )
nType = DataType::BIGINT; // XRow::getLong
- else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int16>::get() )
nType = DataType::SMALLINT; // XRow::getShort
- else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int8>::get() )
nType = DataType::TINYINT; // XRow::getByte
- else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<float>::get() )
nType = DataType::REAL; // XRow::getFloat
- else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<double>::get() )
nType = DataType::DOUBLE; // XRow::getDouble
else if ( rType == getCppuType( static_cast< const Sequence< sal_Int8 > * >( 0 ) ) )
nType = DataType::VARBINARY;// XRow::getBytes
- else if ( rType == getCppuType( static_cast< const Date * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<Date>::get() )
nType = DataType::DATE; // XRow::getDate
- else if ( rType == getCppuType( static_cast< const Time * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<Time>::get() )
nType = DataType::TIME; // XRow::getTime
- else if ( rType == getCppuType( static_cast< const DateTime * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<DateTime>::get() )
nType = DataType::TIMESTAMP;// XRow::getTimestamp
else if ( rType == getCppuType( static_cast< Reference< XInputStream > * >( 0 ) ) )
nType = DataType::LONGVARBINARY; // XRow::getBinaryStream
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 38a8bbbf9c6c..82a8f152587a 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -188,7 +188,7 @@ uno::Sequence< star::ucb::CommandInfo > Content::getCommands(
star::ucb::CommandInfo(
"open",
-1,
- getCppuType( static_cast< star::ucb::OpenCommandArgument2 * >( 0 ) )
+ cppu::UnoType<star::ucb::OpenCommandArgument2>::get()
)
};
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 7191890c345d..88937f553dd8 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -105,11 +105,11 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast< css::uno::Reference< lang::XTypeProvider > *>(0)),
- getCppuType( static_cast< css::uno::Reference< lang::XServiceInfo > *>(0)),
- getCppuType( static_cast< css::uno::Reference< ucb::XContentProvider > *>(0)),
- getCppuType( static_cast< css::uno::Reference< lang::XComponent > *>(0)),
- getCppuType( static_cast< css::uno::Reference< container::XContainerListener > *>(0))
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<lang::XServiceInfo>::get(),
+ cppu::UnoType<ucb::XContentProvider>::get(),
+ cppu::UnoType<lang::XComponent>::get(),
+ cppu::UnoType<container::XContainerListener>::get()
);
pCollection = &collection;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 14:38:56 +0000