[Libreoffice-commits] core.git: chart2/source sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Tue May 20 14:30:31 PDT 2014
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 4
chart2/source/model/filter/XMLFilter.cxx | 2
chart2/source/model/template/CandleStickChartType.cxx | 4
chart2/source/model/template/PieChartTypeTemplate.cxx | 2
chart2/source/tools/FillProperties.cxx | 4
chart2/source/tools/ModifyListenerHelper.cxx | 4
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 6
sc/source/ui/unoobj/dapiuno.cxx | 26
sc/source/ui/unoobj/datauno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 4
sd/source/core/text/textapi.cxx | 6
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 6
sd/source/ui/unoidl/DrawController.cxx | 16
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
sd/source/ui/unoidl/randomnode.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 10
sfx2/source/dialog/backingcomp.cxx | 14
sfx2/source/doc/iframe.cxx | 8
sfx2/source/doc/plugin.cxx | 4
sfx2/source/doc/printhelper.cxx | 8
sfx2/source/doc/sfxbasemodel.cxx | 58 -
sfx2/source/sidebar/Theme.cxx | 10
sfx2/source/view/sfxbasecontroller.cxx | 10
svtools/source/java/javacontext.cxx | 4
svtools/source/java/javainteractionhandler.cxx | 4
svtools/source/uno/statusbarcontroller.cxx | 4
svtools/source/uno/toolboxcontroller.cxx | 4
svtools/source/uno/unoimap.cxx | 14
svx/source/accessibility/AccessibleGraphicShape.cxx | 2
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 6
svx/source/fmcomp/fmgridif.cxx | 4
svx/source/form/dataaccessdescriptor.cxx | 8
svx/source/form/fmdpage.cxx | 2
svx/source/form/fmundo.cxx | 2
svx/source/form/fmvwimp.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/form/navigatortreemodel.cxx | 6
svx/source/table/accessibletableshape.cxx | 2
svx/source/table/cell.cxx | 18
svx/source/unodraw/XPropertyTable.cxx | 10
svx/source/unodraw/gluepts.cxx | 2
svx/source/unodraw/unodtabl.cxx | 2
svx/source/unodraw/unogtabl.cxx | 2
svx/source/unodraw/unohtabl.cxx | 2
svx/source/unodraw/unopool.cxx | 22
svx/source/unodraw/unoprov.cxx | 350 +++++-----
svx/source/unodraw/unoshap2.cxx | 6
svx/source/unodraw/unoshap3.cxx | 2
svx/source/unodraw/unoshape.cxx | 194 ++---
svx/source/unodraw/unoshcol.cxx | 2
svx/source/unodraw/unottabl.cxx | 2
svx/source/unogallery/unogalitem.cxx | 32
svx/source/unogallery/unogaltheme.cxx | 12
svx/source/unogallery/unogalthemeprovider.cxx | 14
svx/source/xml/xmleohlp.cxx | 4
svx/source/xml/xmlxtimp.cxx | 8
svx/source/xoutdev/xattr.cxx | 4
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 10
sw/source/core/uibase/uno/unotxdoc.cxx | 48 -
sw/source/core/unocore/unosett.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 3
vcl/source/window/dndlcon.cxx | 20
xmloff/source/chart/ColorPropertySet.cxx | 2
xmloff/source/chart/PropertyMaps.cxx | 8
xmloff/source/chart/SchXMLEnumConverter.cxx | 4
xmloff/source/core/SettingsExportHelper.cxx | 12
xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx | 2
xmloff/source/core/unoatrcn.cxx | 6
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/draw/sdpropls.cxx | 38 -
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/style/prhdlfac.cxx | 4
xmloff/source/text/XMLAutoTextEventImport.cxx | 4
xmloff/source/text/txtparae.cxx | 2
xmloff/source/text/txtprhdl.cxx | 6
xmloff/source/transform/OOo2Oasis.cxx | 8
xmloff/source/transform/TransformerBase.cxx | 6
82 files changed, 585 insertions(+), 586 deletions(-)
New commits:
commit 227af32d8c6d5e3649c83fcdb274298bc7faa294
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 20 23:29:28 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 4633f2a..caccf12 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -195,7 +195,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AddIn",
PROP_DOCUMENT_ADDIN,
- ::getCppuType( reinterpret_cast< Reference< util::XRefreshable > * >(0)),
+ cppu::UnoType<util::XRefreshable>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -207,7 +207,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AdditionalShapes",
PROP_DOCUMENT_ADDITIONAL_SHAPES,
- ::getCppuType( reinterpret_cast< Reference< drawing::XShapes > * >(0)),
+ cppu::UnoType<drawing::XShapes>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::READONLY ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 796d755..c7d808c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1059,21 +1059,21 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
rOutProperties.push_back(
Property( "DataRegressionProperties",
PROP_CHART_STATISTIC_REGRESSION_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataErrorProperties",
PROP_CHART_STATISTIC_ERROR_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataMeanValueProperties",
PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES,
- ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 9fef7da..2469312 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -266,14 +266,14 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
rOutProperties.push_back(
Property( "Volume",
PROP_CHART_STOCK_VOLUME,
- ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "UpDown",
PROP_CHART_STOCK_UPDOWN,
- ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 32f0419..bc5f494 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -339,7 +339,7 @@ sal_Int32 XMLFilter::impl_Import(
{ OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
- ::getCppuType( (Reference<XInterface> *)0 ),
+ cppu::UnoType<XInterface>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
::cppu::UnoType<OUString>::get(),
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 57320b9..faf5f39 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -59,13 +59,13 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "WhiteDay",
PROP_CANDLESTICKCHARTTYPE_WHITE_DAY,
- ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "BlackDay",
PROP_CANDLESTICKCHARTTYPE_BLACK_DAY,
- ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index b30f633..e49decf 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -63,7 +63,7 @@ static void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "OffsetMode",
PROP_PIE_TEMPLATE_OFFSET_MODE,
- ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)),
+ cppu::UnoType<chart2::PieChartOffsetMode>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index a6177d6..5316984 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -94,7 +94,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillBackground",
FillProperties::PROP_FILL_BACKGROUND,
- ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
@@ -147,7 +147,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
rOutProperties.push_back(
Property( "FillBitmapLogicalSize",
FillProperties::PROP_FILL_BITMAP_LOGICALSIZE,
- ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+ cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3245ca5..ae5e5d0 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -39,7 +39,7 @@ void lcl_fireModifyEvent(
const lang::EventObject * pEvent )
{
::cppu::OInterfaceContainerHelper * pCntHlp = rBroadcastHelper.getContainer(
- ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+ cppu::UnoType<util::XModifyListener>::get());
if( pCntHlp )
{
lang::EventObject aEventToSend;
@@ -156,7 +156,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSource )
{
::cppu::OInterfaceContainerHelper * pCntHlp = m_aModifyListeners.getContainer(
- ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+ cppu::UnoType<util::XModifyListener>::get());
if( pCntHlp )
pCntHlp->disposeAndClear( lang::EventObject( xSource ) );
}
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index d3fb0ed..335d697 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -736,7 +736,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx
Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception )
{
Sequence< ::com::sun::star::uno::Type > aSeq( 1 );
- aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleText >* >( NULL ) );
+ aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get();
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
@@ -1234,8 +1234,8 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc
Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception )
{
Sequence< ::com::sun::star::uno::Type > aSeq( 2 );
- aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleTable >* >( NULL ) );
- aSeq[ 1 ] = getCppuType( static_cast< const Reference< XAccessibleSelection >* >( NULL ) );
+ aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get();
+ aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get();
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 0ca5275..3ace2c4 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -493,7 +493,7 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XDataPilotTable2>*)0);
+ return cppu::UnoType<XDataPilotTable2>::get();
}
sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception)
@@ -620,12 +620,12 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
{
aTypes.realloc( 6 );
uno::Type* pPtr = aTypes.getArray();
- pPtr[ 0 ] = getCppuType( (const Reference< XDataPilotDescriptor >*)0 );
- pPtr[ 1 ] = getCppuType( (const Reference< XPropertySet >*)0 );
- pPtr[ 2 ] = getCppuType( (const Reference< XDataPilotDataLayoutFieldSupplier >*)0 );
- pPtr[ 3 ] = getCppuType( (const Reference< lang::XUnoTunnel >*)0 );
- pPtr[ 4 ] = getCppuType( (const Reference< lang::XTypeProvider >*)0 );
- pPtr[ 5 ] = getCppuType( (const Reference< lang::XServiceInfo >*)0 );
+ pPtr[ 0 ] = cppu::UnoType<XDataPilotDescriptor>::get();
+ pPtr[ 1 ] = cppu::UnoType<XPropertySet>::get();
+ pPtr[ 2 ] = cppu::UnoType<XDataPilotDataLayoutFieldSupplier>::get();
+ pPtr[ 3 ] = cppu::UnoType<lang::XUnoTunnel>::get();
+ pPtr[ 4 ] = cppu::UnoType<lang::XTypeProvider>::get();
+ pPtr[ 5 ] = cppu::UnoType<lang::XServiceInfo>::get();
}
return aTypes;
}
@@ -1128,8 +1128,8 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce
for (sal_Int32 i = 0; i < nParentLen; ++i)
pPtr[ i ] = pParentPtr[ i ]; // parent types first
- pPtr[ nParentLen ] = getCppuType( (const Reference< XDataPilotTable2 >*)0 );
- pPtr[ nParentLen+1 ] = getCppuType( (const Reference< XModifyBroadcaster >*)0 );
+ pPtr[ nParentLen ] = cppu::UnoType<XDataPilotTable2>::get();
+ pPtr[ nParentLen+1 ] = cppu::UnoType<XModifyBroadcaster>::get();
}
return aTypes;
}
@@ -1737,7 +1737,7 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XPropertySet>*)0);
+ return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception)
@@ -2969,7 +2969,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType( (Reference< XNameAccess >*)0 );
+ return cppu::UnoType<XNameAccess>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception)
@@ -3153,7 +3153,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration()
uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType( (Reference< XNamed >*)0 );
+ return cppu::UnoType<XNamed>::get();
}
sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception)
@@ -3312,7 +3312,7 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType((Reference<XPropertySet>*)0);
+ return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception)
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index fd160cf..09762b1 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -95,7 +95,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap()
{OUString(SC_UNONAME_COPYOUT), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_ISCASE), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_MAXFLD), 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0},
- {OUString(SC_UNONAME_ORIENT), 0, getCppuType((table::TableOrientation*)0), 0, 0},
+ {OUString(SC_UNONAME_ORIENT), 0, cppu::UnoType<table::TableOrientation>::get(), 0, 0},
{OUString(SC_UNONAME_OUTPOS), 0, cppu::UnoType<table::CellAddress>::get(), 0, 0},
{OUString(SC_UNONAME_SAVEOUT), 0, getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_SKIPDUP), 0, getBooleanCppuType(), 0, 0},
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 27cc395..86e7fc8 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1675,7 +1675,7 @@ uno::Type SAL_CALL ScExternalDocLinkObj::getElementType()
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType(static_cast<Reference<sheet::XExternalDocLink>*>(0));
+ return cppu::UnoType<sheet::XExternalDocLink>::get();
}
sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements()
@@ -1789,7 +1789,7 @@ uno::Type SAL_CALL ScExternalDocLinksObj::getElementType()
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return getCppuType(static_cast<Reference<sheet::XExternalDocLinks>*>(0));
+ return cppu::UnoType<sheet::XExternalDocLinks>::get();
}
sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements()
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 0eedb57..b705e41 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -120,10 +120,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 },
+ {OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 },
{OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
- {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
- {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
+ {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
+ {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4205bf9..411ffad 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -727,7 +727,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup )
if ( !mXShape.is() )
break;
- Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) ));
+ Any aAny( mXShape->queryInterface( cppu::UnoType<XPropertySet>::get()));
aAny >>= mXPropSet;
if ( !mXPropSet.is() )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 1befad1..411e7b1 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -447,7 +447,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
{ OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PageLayouts"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
- ::getCppuType( (Reference<XInterface> *)0 ),
+ cppu::UnoType<XInterface>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
::cppu::UnoType<OUString>::get(),
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8ccd117..2891489 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1671,7 +1671,7 @@ void CustomAnimationPane::onChange( bool bCreate )
Reference< XSelectionSupplier > xSel( mxView, UNO_QUERY_THROW );
maViewSelection = xSel->getSelection();
- if( maViewSelection.getValueType() == ::getCppuType((const Reference< XShapes >*)0) )
+ if( maViewSelection.getValueType() == cppu::UnoType<XShapes>::get())
{
Reference< XIndexAccess > xShapes;
maViewSelection >>= xShapes;
@@ -1691,7 +1691,7 @@ void CustomAnimationPane::onChange( bool bCreate )
}
}
}
- else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XShape >*)0) )
+ else if ( maViewSelection.getValueType() == cppu::UnoType<XShape>::get())
{
aTargets.push_back( maViewSelection );
Reference< XText > xText;
@@ -1699,7 +1699,7 @@ void CustomAnimationPane::onChange( bool bCreate )
if( !xText.is() || xText->getString().isEmpty() )
bHasText = false;
}
- else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XTextCursor >*)0) )
+ else if ( maViewSelection.getValueType() == cppu::UnoType<XTextCursor>::get())
{
Reference< XShape > xShape;
std::list< sal_Int16 > aParaList;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index f5ed766..380b69c 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -68,7 +68,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw()
OMultiTypeInterfaceContainerHelper::keyType>& >(
BroadcastHelperOwner::maBroadcastHelper)),
m_aSelectionTypeIdentifier(
- ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 )),
+ cppu::UnoType<view::XSelectionChangeListener>::get()),
mpBase(&rBase),
maLastVisArea(),
mpCurrentPage(NULL),
@@ -125,9 +125,9 @@ Sequence<Type> SAL_CALL DrawController::getTypes (void)
// OPropertySetHelper does not provide getTypes, so we have to
// implement this method manually and list its three interfaces.
OTypeCollection aTypeCollection (
- ::getCppuType (( const Reference<beans::XMultiPropertySet>*)NULL),
- ::getCppuType (( const Reference<beans::XFastPropertySet>*)NULL),
- ::getCppuType (( const Reference<beans::XPropertySet>*)NULL));
+ cppu::UnoType<beans::XMultiPropertySet>::get(),
+ cppu::UnoType<beans::XFastPropertySet>::get(),
+ cppu::UnoType<beans::XPropertySet>::get());
return ::comphelper::concatSequences(
SfxBaseController::getTypes(),
@@ -328,7 +328,7 @@ void SAL_CALL
ThrowIfDisposed();
// Have to forward the event to our selection change listeners.
OInterfaceContainerHelper* pListeners = BroadcastHelperOwner::maBroadcastHelper.getContainer(
- ::getCppuType((Reference<view::XSelectionChangeListener>*)0));
+ cppu::UnoType<view::XSelectionChangeListener>::get());
if (pListeners)
{
// Re-send the event to all of our listeners.
@@ -706,13 +706,13 @@ void DrawController::FillPropertyTable (
beans::Property(
"SubController",
PROPERTY_SUB_CONTROLLER,
- ::getCppuType((const Reference<drawing::XDrawSubController>*)0),
+ cppu::UnoType<drawing::XDrawSubController>::get(),
beans::PropertyAttribute::BOUND));
rProperties.push_back(
beans::Property(
"CurrentPage",
PROPERTY_CURRENTPAGE,
- ::getCppuType((const Reference< drawing::XDrawPage > *)0),
+ cppu::UnoType<drawing::XDrawPage>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("IsLayerMode",
@@ -727,7 +727,7 @@ void DrawController::FillPropertyTable (
rProperties.push_back(
beans::Property("ActiveLayer",
PROPERTY_ACTIVE_LAYER,
- ::getCppuType((const Reference< drawing::XLayer > *)0),
+ cppu::UnoType<drawing::XLayer>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("ZoomValue",
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index f84a973..9ba698d 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -190,7 +190,7 @@ enum SdDocumentSettingsPropertyHandles
{ OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, ::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 },
+ { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, cppu::UnoType<XForbiddenCharacters>::get(), 0, 0 },
{ OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, ::getBooleanCppuType(), 0, 0 },
{ OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index b9c84b9..7ed6c84 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -547,7 +547,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti
// XElementAccess
Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception)
{
- return ::getCppuType((const Reference< XAnimationNode >*)0);
+ return cppu::UnoType<XAnimationNode>::get();
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ebc9d65..a4fd2e2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -124,10 +124,10 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0},
- { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0), 0, 0},
+ { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0},
{ OUString("IsBackgroundDark") , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
@@ -198,7 +198,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, \
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \
@@ -271,7 +271,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -287,7 +287,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
- { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 355a373..4a3d45f 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -268,13 +268,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
lWindowTypes = xProvider->getTypes();
static ::cppu::OTypeCollection aTypeCollection(
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XInitialization >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XController >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XComponent >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatchProvider >*)NULL ),
- ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
+ cppu::UnoType<css::lang::XInitialization>::get(),
+ cppu::UnoType<css::lang::XTypeProvider>::get(),
+ cppu::UnoType<css::lang::XServiceInfo>::get(),
+ cppu::UnoType<css::frame::XController>::get(),
+ cppu::UnoType<css::lang::XComponent>::get(),
+ cppu::UnoType<css::frame::XDispatchProvider>::get(),
+ cppu::UnoType<css::frame::XDispatch>::get(),
lWindowTypes);
pTypeCollection = &aTypeCollection;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index c0631e0..bfa7485 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -143,10 +143,10 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
{ OUString("FrameIsAutoScroll"), WID_FRAME_IS_AUTO_SCROLL, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
{ OUString("FrameIsBorder"), WID_FRAME_IS_BORDER, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
{ OUString("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
- { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
- { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 },
- { OUString("FrameName"), WID_FRAME_NAME, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
- { OUString("FrameURL"), WID_FRAME_URL, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameName"), WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("FrameURL"), WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aIFramePropertyMap_Impl;
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index a1743fd..51ce5b1 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -73,8 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] =
{
{ OUString("PluginCommands"), WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0},
- { OUString("PluginMimeType"), WID_MIMETYPE, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
- { OUString("PluginURL"), WID_URL , ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 },
+ { OUString("PluginMimeType"), WID_MIMETYPE, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+ { OUString("PluginURL"), WID_URL , cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return aPluginPropertyMap_Impl;
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e87d2a7..87e2ca8 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -623,7 +623,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// unpack th URL and check for a valid and well known protocol
OUString sTemp;
if (
- ( rProp.Value.getValueType()!=::getCppuType((const OUString*)0)) ||
+ ( rProp.Value.getValueType()!=cppu::UnoType<OUString>::get()) ||
(!(rProp.Value>>=sTemp))
)
{
@@ -807,7 +807,7 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
}
::cppu::OInterfaceContainerHelper* pContainer = m_aInterfaceContainer.getContainer(
- ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) );
+ cppu::UnoType<view::XPrintJobListener>::get());
if ( !pContainer )
return;
@@ -823,13 +823,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
}
void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index b50afe1..40ab212 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -333,7 +333,7 @@ void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& )
void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException, std::exception)
{
- ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< view::XPrintJobListener >*) NULL ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<view::XPrintJobListener>::get());
if ( pContainer!=NULL )
{
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -802,7 +802,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe
throw(RuntimeException, std::exception)
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
@@ -813,7 +813,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventLi
throw(RuntimeException, std::exception)
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
void
@@ -859,11 +859,11 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
Reference< document::XEventListener > xDocListener( aObject.Source, UNO_QUERY );
if ( xMod.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xMod );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xMod );
else if ( xListener.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
else if ( xDocListener.is() )
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
}
@@ -1337,7 +1337,7 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XModifyListener >*)0),xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XModifyListener>::get(),xListener );
}
@@ -1348,7 +1348,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
}
@@ -1363,7 +1363,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
lang::EventObject aSource (static_cast< ::cppu::OWeakObject*>(this));
- ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get());
if (pContainer!=NULL)
{
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -1391,7 +1391,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
// no own objections against closing!
m_pData->m_bClosing = true;
- pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
+ pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get());
if (pContainer!=NULL)
{
::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
@@ -1422,7 +1422,7 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -1433,7 +1433,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
}
@@ -2058,7 +2058,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
}
}
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2094,7 +2094,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
}
}
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
{
// means HGLOBAL handler to memory storage containing METAFILEPICT structure
@@ -2225,12 +2225,12 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
aFlavorSeq[8].MimeType =
OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" );
aFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile";
- aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 );
+ aFlavorSeq[8].DataType = cppu::UnoType<sal_uInt64>::get();
aFlavorSeq[9].MimeType =
OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" );
aFlavorSeq[9].HumanPresentableName = "Windows MetaFile";
- aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 );
+ aFlavorSeq[9].DataType = cppu::UnoType<sal_uInt64>::get();
}
return aFlavorSeq;
@@ -2261,7 +2261,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
return sal_True;
}
else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
@@ -2269,7 +2269,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
- && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
+ && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
return sal_True;
}
else if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" )
@@ -2390,7 +2390,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XEventListener>::get(), aListener );
}
@@ -2401,7 +2401,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), aListener );
}
@@ -2412,7 +2412,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document:
throw ( RuntimeException, std::exception )
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
- m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
}
@@ -2420,7 +2420,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume
throw ( RuntimeException, std::exception )
{
SfxModelGuard aGuard( *this );
- m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
+ m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
}
@@ -2834,7 +2834,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
void SfxBaseModel::NotifyModifyListeners_Impl() const
{
- ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< util::XModifyListener >*)0) );
+ ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XModifyListener>::get());
if ( pIC )
{
lang::EventObject aEvent( (frame::XModel *)this );
@@ -3164,7 +3164,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
return;
::cppu::OInterfaceContainerHelper* pIC =
- m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XDocumentEventListener >*)0 ) );
+ m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XDocumentEventListener>::get());
if ( pIC )
{
SAL_INFO("sfx.doc", "SfxDocumentEvent: " + aName);
@@ -3177,7 +3177,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
aDocumentEvent ) );
}
- pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XEventListener >*)0 ) );
+ pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get());
if ( pIC )
{
SAL_INFO("sfx.doc", "SfxEvent: " + aName);
@@ -3250,7 +3250,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
return;
::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
- ::getCppuType((const Reference< document::XEventListener >*)0) );
+ cppu::UnoType<document::XEventListener>::get());
if( pIC )
{
@@ -3272,7 +3272,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
/** returns true if someone added a XEventListener to this XEventBroadcaster */
bool SfxBaseModel::hasEventListeners() const
{
- return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) );
+ return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get()) );
}
void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception)
@@ -3869,7 +3869,7 @@ void SAL_CALL SfxBaseModel::addStorageChangeListener(
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
m_pData->m_aInterfaceContainer.addInterface(
- ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
void SAL_CALL SfxBaseModel::removeStorageChangeListener(
@@ -3879,7 +3879,7 @@ void SAL_CALL SfxBaseModel::removeStorageChangeListener(
SfxModelGuard aGuard( *this );
m_pData->m_aInterfaceContainer.removeInterface(
- ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
#include "printhelper.hxx"
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 151cfed..701a0947 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -904,22 +904,22 @@ cssu::Type Theme::GetCppuType (const PropertyType eType)
switch(eType)
{
case PT_Image:
- return getCppuType((rtl::OUString*)NULL);
+ return cppu::UnoType<rtl::OUString>::get();
case PT_Color:
- return getCppuType((sal_uInt32*)NULL);
+ return cppu::UnoType<sal_uInt32>::get();
case PT_Paint:
return getCppuVoidType();
case PT_Integer:
- return getCppuType((sal_Int32*)NULL);
+ return cppu::UnoType<sal_Int32>::get();
case PT_Boolean:
- return getCppuType((sal_Bool*)NULL);
+ return cppu::UnoType<sal_Bool>::get();
case PT_Rectangle:
- return getCppuType((awt::Rectangle*)NULL);
+ return cppu::UnoType<awt::Rectangle>::get();
case PT_Invalid:
default:
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 98ad17d..9c07350 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -911,14 +911,14 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0),
+ m_pData->m_aListenerContainer.addInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
xListener );
}
void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0),
+ m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
xListener );
}
@@ -939,7 +939,7 @@ awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectang
void SfxBaseController::BorderWidthsChanged_Impl()
{
::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer(
- ::getCppuType( ( const Reference< frame::XBorderResizeListener >*) NULL ) );
+ cppu::UnoType<frame::XBorderResizeListener>::get());
if ( pContainer )
{
frame::BorderWidths aBWidths = getBorder();
@@ -1037,7 +1037,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::excepti
void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
@@ -1046,7 +1046,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent
void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
{
- m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+ m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
void SfxBaseController::ReleaseShell_Impl()
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index f5be477..66c85d5 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -43,9 +43,9 @@ JavaContext::~JavaContext()
Any SAL_CALL JavaContext::queryInterface(const Type& aType )
throw (RuntimeException, std::exception)
{
- if (aType == getCppuType(reinterpret_cast<Reference<XInterface>*>(0)))
+ if (aType == cppu::UnoType<XInterface>::get())
return Any(Reference<XInterface>(static_cast<XInterface*>(this)));
- else if (aType == getCppuType(reinterpret_cast<Reference<XCurrentContext>*>(0)))
+ else if (aType == cppu::UnoType<XCurrentContext>::get())
return Any(Reference<XCurrentContext>( static_cast<XCurrentContext*>(this)));
return Any();
}
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 943e4f6..6d2e549 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -64,9 +64,9 @@ JavaInteractionHandler::~JavaInteractionHandler()
Any SAL_CALL JavaInteractionHandler::queryInterface(const Type& aType )
throw (RuntimeException, std::exception)
{
- if (aType == getCppuType(reinterpret_cast<Reference<XInterface>*>(0)))
+ if (aType == cppu::UnoType<XInterface>::get())
return Any( static_cast<XInterface*>(this), aType);
- else if (aType == getCppuType(reinterpret_cast<Reference<XInteractionHandler>*>(0)))
+ else if (aType == cppu::UnoType<XInteractionHandler>::get())
return Any( static_cast<XInteractionHandler*>(this), aType);
return Any();
}
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 0573aa6..a0fb056 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -236,13 +236,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
void SAL_CALL StatusbarController::addEventListener( const Reference< XEventListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+ m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
void SAL_CALL StatusbarController::removeEventListener( const Reference< XEventListener >& aListener )
throw ( RuntimeException, std::exception )
{
- m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), aListener );
+ m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener );
}
// XEventListener
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index da94dd0..81c7029 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -277,13 +277,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
void SAL_CALL ToolboxController::addEventListener( const Reference< XEventListener >& xListener )
throw ( RuntimeException, std::exception )
{
- m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+ m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
void SAL_CALL ToolboxController::removeEventListener( const Reference< XEventListener >& aListener )
throw ( RuntimeException, std::exception )
{
- m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), aListener );
+ m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener );
}
// XEventListener
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 8e55f44..dda3dcd 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -316,17 +316,17 @@ Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType )
{
Any aAny;
- if( rType == ::getCppuType((const Reference< XServiceInfo >*)0) )
+ if( rType == cppu::UnoType<XServiceInfo>::get())
aAny <<= Reference< XServiceInfo >(this);
- else if( rType == ::getCppuType((const Reference< XTypeProvider >*)0) )
+ else if( rType == cppu::UnoType<XTypeProvider>::get())
aAny <<= Reference< XTypeProvider >(this);
- else if( rType == ::getCppuType((const Reference< XPropertySet >*)0) )
+ else if( rType == cppu::UnoType<XPropertySet>::get())
aAny <<= Reference< XPropertySet >(this);
- else if( rType == ::getCppuType((const Reference< XEventsSupplier >*)0) )
+ else if( rType == cppu::UnoType<XEventsSupplier>::get())
aAny <<= Reference< XEventsSupplier >(this);
- else if( rType == ::getCppuType((const Reference< XMultiPropertySet >*)0) )
+ else if( rType == cppu::UnoType<XMultiPropertySet>::get())
aAny <<= Reference< XMultiPropertySet >(this);
- else if( rType == ::getCppuType((const Reference< XUnoTunnel >*)0) )
+ else if( rType == cppu::UnoType<XUnoTunnel>::get())
aAny <<= Reference< XUnoTunnel >(this);
else
aAny <<= OWeakAggObject::queryAggregation( rType );
@@ -684,7 +684,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
// XElementAccess
Type SAL_CALL SvUnoImageMap::getElementType( ) throw(RuntimeException, std::exception)
{
- return ::getCppuType((const Reference< XPropertySet >*)0);
+ return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException, std::exception)
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 1407e2f..476ac63 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -158,7 +158,7 @@ uno::Sequence<uno::Type> SAL_CALL
long nTypeCount = aTypeList.getLength();
aTypeList.realloc (nTypeCount + 1);
const uno::Type aImageType =
- ::getCppuType((const uno::Reference<XAccessibleImage>*)0);
+ cppu::UnoType<XAccessibleImage>::get();
aTypeList[nTypeCount] = aImageType;
return aTypeList;
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 8fa575c..0e62c15 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -166,7 +166,7 @@ uno::Sequence<uno::Type> SAL_CALL
long nTypeCount = aTypeList.getLength();
aTypeList.realloc (nTypeCount + 1);
const uno::Type aActionType =
- ::getCppuType((const uno::Reference<XAccessibleAction>*)0);
+ cppu::UnoType<XAccessibleAction>::get();
aTypeList[nTypeCount] = aActionType;
return aTypeList;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 1e5fae3..49c1a1d 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1032,11 +1032,11 @@ uno::Sequence<uno::Type> SAL_CALL
uno::Sequence<uno::Type> aComponentTypeList (AccessibleComponentBase::getTypes());
// ... define local types, ...
const uno::Type aLangEventListenerType =
- ::getCppuType((const uno::Reference<lang::XEventListener>*)0);
+ cppu::UnoType<lang::XEventListener>::get();
const uno::Type aDocumentEventListenerType =
- ::getCppuType((const uno::Reference<document::XEventListener>*)0);
+ cppu::UnoType<document::XEventListener>::get();
const uno::Type aUnoTunnelType =
- ::getCppuType((const uno::Reference<lang::XUnoTunnel>*)0);
+ cppu::UnoType<lang::XUnoTunnel>::get();
// ... and merge them all into one list.
sal_Int32 nTypeCount (aTypeList.getLength()),
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index b2bb990..902c821 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -930,7 +930,7 @@ sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::ex
Type SAL_CALL FmXGridControl::getElementType( ) throw(RuntimeException, std::exception)
{
- return ::getCppuType((const Reference< ::com::sun::star::awt::XTextComponent >*)NULL);
+ return cppu::UnoType<com::sun::star::awt::XTextComponent>::get();
}
// XEnumerationAccess
@@ -2350,7 +2350,7 @@ sal_Bool FmXGridPeer::hasElements() throw( RuntimeException, std::exception )
Type SAL_CALL FmXGridPeer::getElementType( ) throw(RuntimeException, std::exception)
{
- return ::getCppuType((Reference< ::com::sun::star::awt::XControl> *)NULL);
+ return cppu::UnoType<com::sun::star::awt::XControl>::get();
}
// XEnumerationAccess
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 2063760..efabc93 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -187,15 +187,15 @@ namespace svx
{
static PropertyMapEntry const s_aDesriptorProperties[] =
{
- { OUString("ActiveConnection"), daConnection, ::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("ActiveConnection"), daConnection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("BookmarkSelection"), daBookmarkSelection, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Column"), daColumnObject, ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Column"), daColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("ColumnName"), daColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("Command"), daCommand, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("CommandType"), daCommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Component"), daComponent, ::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Component"), daComponent, cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("ConnectionResource"), daConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Cursor"), daCursor, ::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Cursor"), daCursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("DataSourceName"), daDataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("DatabaseLocation"), daDatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("EscapeProcessing"), daEscapeProcessing, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index ca6c1fd..c0867cc 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -64,7 +64,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type&
aTypes.realloc(aTypes.getLength() + 1);
::com::sun::star::uno::Type* pTypes = aTypes.getArray();
- pTypes[aTypes.getLength()-1] = ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier>*)0);
+ pTypes[aTypes.getLength()-1] = cppu::UnoType<com::sun::star::form::XFormsSupplier>::get();
return aTypes;
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 9cbf5a9..cc7ea75 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -1089,7 +1089,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
{
// insert the element
Any aVal;
- if ( m_xContainer->getElementType() == ::getCppuType( static_cast< const Reference< XFormComponent >* >( NULL ) ) )
+ if ( m_xContainer->getElementType() == cppu::UnoType<XFormComponent>::get() )
{
aVal <<= Reference< XFormComponent >( m_xElement, UNO_QUERY );
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index f72fe7a..af99789 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -240,7 +240,7 @@ sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeExc
Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception )
{
- return ::getCppuType((const Reference< XFormController>*)0);
+ return cppu::UnoType<XFormController>::get();
}
// XEnumerationAccess
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index fd872b4..0d4457c 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1091,7 +1091,7 @@ sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException, std
Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std::exception )
{
- return ::getCppuType((const Reference< XFormController>*)0);
+ return cppu::UnoType<XFormController>::get();
}
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 213eef9..9df5153 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -310,14 +310,14 @@ namespace svxform
// das Element muss den Typ haben, den der Container erwartet
if (xContainer->getElementType() ==
- ::getCppuType((const Reference< XForm>*)0))
+ cppu::UnoType<XForm>::get())
{
Reference< XForm > xElementAsForm(xElement, UNO_QUERY);
xContainer->insertByIndex(nRelPos, makeAny(xElementAsForm));
}
else if (xContainer->getElementType() ==
- ::getCppuType((const Reference< XFormComponent>*)0))
+ cppu::UnoType<XFormComponent>::get())
{
Reference< XFormComponent > xElementAsComponent(xElement, UNO_QUERY);
@@ -531,7 +531,7 @@ namespace svxform
FmFormData* pSubFormData;
for (sal_Int32 i=0; i<xForms->getCount(); ++i)
{
- DBG_ASSERT( xForms->getByIndex(i).getValueType() == ::getCppuType((const Reference< XForm>*)NULL),
+ DBG_ASSERT( xForms->getByIndex(i).getValueType() == cppu::UnoType<XForm>::get(),
"NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm");
xForms->getByIndex(i) >>= xSubForm;
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 5b09a69..e956850 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -360,7 +360,7 @@ SvxTableController* AccessibleTableShape::getTableController()
Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
{
- if ( aType == ::getCppuType((Reference<XAccessibleTableSelection> *)0) )
+ if ( aType == cppu::UnoType<XAccessibleTableSelection>::get())
{
Reference<XAccessibleTableSelection> xThis( this );
Any aRet;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index ad69f65..3ab9b68 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -74,20 +74,20 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
FILL_PROPERTIES
// { "HasLevels", OWN_ATTR_HASLEVELS, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ), 0, 0},
- { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0},
+ { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get(), 0, 0}, \
{ OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\
+ { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get(), 0, 0},\
{ OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \
- { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, ::getCppuType((const TableBorder*)0), 0, 0 }, \
- { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \
- { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \
- { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \
- { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \
+ { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, \
+ { OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \
+ { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \
+ { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \
+ { OUString("RightBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_CHAR_PROPERTIES,
@@ -1037,7 +1037,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
}
case OWN_ATTR_TABLEBORDER:
{
- if(rValue.getValueType() != ::getCppuType((const TableBorder*)0) )
+ if(rValue.getValueType() != cppu::UnoType<TableBorder>::get())
break;
const TableBorder* pBorder = (const TableBorder* )rValue.getValue();
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 5d30c42..22c30fe 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -348,7 +348,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw
XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw()
{
- if( !rAny.getValue() || rAny.getValueType() != ::getCppuType((const drawing::PolyPolygonBezierCoords*)0) )
+ if( !rAny.getValue() || rAny.getValueType() != cppu::UnoType<drawing::PolyPolygonBezierCoords>::get())
return NULL;
basegfx::B2DPolyPolygon aPolyPolygon;
@@ -366,7 +366,7 @@ XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno:
uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const drawing::PolyPolygonBezierCoords*)0);
+ return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get();
}
// XServiceInfo
@@ -447,7 +447,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An
uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const drawing::LineDash*)0);
+ return cppu::UnoType<drawing::LineDash>::get();
}
// XServiceInfo
@@ -523,7 +523,7 @@ XPropertyEntry* SvxUnoXHatchTable::getEntry( const OUString& rName, const uno::A
uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const drawing::Hatch*)0);
+ return cppu::UnoType<drawing::Hatch>::get();
}
// XServiceInfo
@@ -611,7 +611,7 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno
uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const awt::Gradient*)0);
+ return cppu::UnoType<awt::Gradient>::get();
}
// XServiceInfo
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 0e38b86..09601a0 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -520,7 +520,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
uno::Type SAL_CALL SvxUnoGluePointAccess::getElementType()
throw( uno::RuntimeException, std::exception)
{
- return ::getCppuType((const struct drawing::GluePoint2*)0);
+ return cppu::UnoType<drawing::GluePoint2>::get();
}
sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements()
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index b860a32..8f9e316 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -83,7 +83,7 @@ NameOrIndex* SvxUnoDashTable::createItem() const throw()
uno::Type SAL_CALL SvxUnoDashTable::getElementType( )
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const struct drawing::LineDash*)0);
+ return cppu::UnoType<drawing::LineDash>::get();
}
/**
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 93f5eadf..dc72188 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -82,7 +82,7 @@ NameOrIndex* SvxUnoGradientTable::createItem() const throw()
uno::Type SAL_CALL SvxUnoGradientTable::getElementType( )
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const struct awt::Gradient*)0);
+ return cppu::UnoType<awt::Gradient>::get();
}
/**
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 2e17ada..1b0adc1 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -80,7 +80,7 @@ NameOrIndex* SvxUnoHatchTable::createItem() const throw()
uno::Type SAL_CALL SvxUnoHatchTable::getElementType( )
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const struct drawing::Hatch*)0);
+ return cppu::UnoType<drawing::Hatch>::get();
}
/**
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 5575e3e..bd92c96 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -340,15 +340,15 @@ uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType )
{
uno::Any aAny;
- if( rType == ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0) )
+ if( rType == cppu::UnoType<lang::XServiceInfo>::get())
aAny <<= uno::Reference< lang::XServiceInfo >(this);
- else if( rType == ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0) )
+ else if( rType == cppu::UnoType<lang::XTypeProvider>::get())
aAny <<= uno::Reference< lang::XTypeProvider >(this);
- else if( rType == ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) )
+ else if( rType == cppu::UnoType<beans::XPropertySet>::get())
aAny <<= uno::Reference< beans::XPropertySet >(this);
- else if( rType == ::getCppuType((const uno::Reference< beans::XPropertyState >*)0) )
+ else if( rType == cppu::UnoType<beans::XPropertyState>::get())
aAny <<= uno::Reference< beans::XPropertyState >(this);
- else if( rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0) )
+ else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get())
aAny <<= uno::Reference< beans::XMultiPropertySet >(this);
else
aAny <<= OWeakAggObject::queryAggregation( rType );
@@ -372,12 +372,12 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
uno::Sequence< uno::Type > aTypes( 6 );
uno::Type* pTypes = aTypes.getArray();
- *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet>*)0);
+ *pTypes++ = cppu::UnoType<uno::XAggregation>::get();
+ *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get();
+ *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get();
+ *pTypes++ = cppu::UnoType<beans::XPropertySet>::get();
+ *pTypes++ = cppu::UnoType<beans::XPropertyState>::get();
+ *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get();
return aTypes;
}
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ca70ab7..b3bdd2c 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -66,8 +66,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -90,8 +90,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -114,8 +114,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
TEXT_PROPERTIES
// #FontWork#
FONTWORK_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -138,8 +138,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
TEXT_PROPERTIES
// #FontWork#
FONTWORK_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -163,8 +163,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -189,8 +189,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -201,7 +201,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
{
static SfxItemPropertyMapEntry const aPolyPolygonBezierPropertyMap_Impl[] =
{
- { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0 },
+ { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0 },
SPECIAL_POLYGON_PROPERTIES
SPECIAL_POLYPOLYGONBEZIER_PROPERTIES
FILL_PROPERTIES
@@ -215,8 +215,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -245,8 +245,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
// #FontWork#
FONTWORK_PROPERTIES
{ OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 0},
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -285,8 +285,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -306,8 +306,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
return a3DSphereObjectPropertyMap_Impl;
@@ -331,8 +331,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -357,8 +357,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -378,8 +378,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -421,8 +421,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
SPECIAL_3DBACKSCALE_PROPERTIES
SPECIAL_3DPOLYGONOBJECT_PROPERTIES
CUSTOMSHAPE_PROPERTIES
- { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -457,18 +457,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
TEXT_PROPERTIES
FONTWORK_PROPERTIES
- { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Model"), OWN_ATTR_OLEMODEL , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("OriginalSize"), OWN_ATTR_OLESIZE , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("CLSID"), OWN_ATTR_CLSID , ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<com::sun::star::frame::XModel>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<com::sun::star::embed::XEmbeddedObject>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<com::sun::star::embed::XEmbeddedObject>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list